diff --git a/Dockerfile b/Dockerfile
index dfd64d1..5edd9dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,8 @@ ARG DOTFILES_DIR="/workdir/.dotfiles"
 RUN mkdir -p "$DOTFILES_DIR"
 RUN chown -R "test-user" "$DOTFILES_DIR"
 
-ADD --chown="test-user" files "$DOTFILES_DIR/files"
+ADD --chown="test-user" home "$DOTFILES_DIR/home"
+ADD --chown="test-user" install.d "$DOTFILES_DIR/install.d"
 ADD --chown="test-user" script "$DOTFILES_DIR/script"
 WORKDIR "$DOTFILES_DIR"
 
diff --git a/Dockerfile.arch b/Dockerfile.arch
index 73eada9..b67e49d 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -27,7 +27,8 @@ ARG DOTFILES_DIR="/workdir/.dotfiles"
 RUN mkdir -p "$DOTFILES_DIR" && \
     chown -R "test-user" "$DOTFILES_DIR"
 
-ADD --chown="test-user" files "$DOTFILES_DIR/files"
+ADD --chown="test-user" home "$DOTFILES_DIR/home"
+ADD --chown="test-user" install.d "$DOTFILES_DIR/install.d"
 ADD --chown="test-user" script "$DOTFILES_DIR/script"
 WORKDIR "$DOTFILES_DIR"
 
diff --git a/script/install.d/00-os.sh b/install.d/00-os.sh
similarity index 100%
rename from script/install.d/00-os.sh
rename to install.d/00-os.sh
diff --git a/script/install.d/10-brew.sh b/install.d/10-brew.sh
similarity index 100%
rename from script/install.d/10-brew.sh
rename to install.d/10-brew.sh
diff --git a/script/install.d/11-apt.sh b/install.d/11-apt.sh
similarity index 100%
rename from script/install.d/11-apt.sh
rename to install.d/11-apt.sh
diff --git a/script/install.d/12-pacman.sh b/install.d/12-pacman.sh
similarity index 100%
rename from script/install.d/12-pacman.sh
rename to install.d/12-pacman.sh
diff --git a/script/install.d/20-ssh.sh b/install.d/20-ssh.sh
similarity index 100%
rename from script/install.d/20-ssh.sh
rename to install.d/20-ssh.sh
diff --git a/script/install.d/21-git.sh b/install.d/21-git.sh
similarity index 100%
rename from script/install.d/21-git.sh
rename to install.d/21-git.sh
diff --git a/script/install.d/22-zsh.sh b/install.d/22-zsh.sh
similarity index 100%
rename from script/install.d/22-zsh.sh
rename to install.d/22-zsh.sh
diff --git a/script/install.d/23-stow.sh b/install.d/23-stow.sh
similarity index 100%
rename from script/install.d/23-stow.sh
rename to install.d/23-stow.sh
diff --git a/script/install.d/24-tmux.sh b/install.d/24-tmux.sh
similarity index 100%
rename from script/install.d/24-tmux.sh
rename to install.d/24-tmux.sh
diff --git a/script/install.d/30-mise.sh b/install.d/30-mise.sh
similarity index 100%
rename from script/install.d/30-mise.sh
rename to install.d/30-mise.sh
diff --git a/script/install.d/41-docker.sh b/install.d/41-docker.sh
similarity index 100%
rename from script/install.d/41-docker.sh
rename to install.d/41-docker.sh
diff --git a/script/install.d/42-azure.sh b/install.d/42-azure.sh
similarity index 100%
rename from script/install.d/42-azure.sh
rename to install.d/42-azure.sh
diff --git a/script/install.d/50-redis.sh b/install.d/50-redis.sh
similarity index 100%
rename from script/install.d/50-redis.sh
rename to install.d/50-redis.sh
diff --git a/script/install.d/60-iterm2.sh b/install.d/60-iterm2.sh
similarity index 100%
rename from script/install.d/60-iterm2.sh
rename to install.d/60-iterm2.sh
diff --git a/script/install.d/61-nerdfont.sh b/install.d/61-nerdfont.sh
similarity index 100%
rename from script/install.d/61-nerdfont.sh
rename to install.d/61-nerdfont.sh
diff --git a/script/install.d/70-cca.sh b/install.d/70-cca.sh
similarity index 100%
rename from script/install.d/70-cca.sh
rename to install.d/70-cca.sh
diff --git a/script/install.d/71-rectangle.sh b/install.d/71-rectangle.sh
similarity index 100%
rename from script/install.d/71-rectangle.sh
rename to install.d/71-rectangle.sh
diff --git a/script/install.d/72-meetingbar.sh b/install.d/72-meetingbar.sh
similarity index 100%
rename from script/install.d/72-meetingbar.sh
rename to install.d/72-meetingbar.sh
diff --git a/script/install.d/73-betterdisplay.sh b/install.d/73-betterdisplay.sh
similarity index 100%
rename from script/install.d/73-betterdisplay.sh
rename to install.d/73-betterdisplay.sh
diff --git a/script/install.d/74-dockutil.sh b/install.d/74-dockutil.sh
similarity index 100%
rename from script/install.d/74-dockutil.sh
rename to install.d/74-dockutil.sh
diff --git a/script/install.d/81-cmatrix.sh b/install.d/81-cmatrix.sh
similarity index 100%
rename from script/install.d/81-cmatrix.sh
rename to install.d/81-cmatrix.sh
diff --git a/script/install.d/90-macos.sh b/install.d/90-macos.sh
similarity index 100%
rename from script/install.d/90-macos.sh
rename to install.d/90-macos.sh
diff --git a/script/install.d/99-fastfetch.sh b/install.d/99-fastfetch.sh
similarity index 100%
rename from script/install.d/99-fastfetch.sh
rename to install.d/99-fastfetch.sh
diff --git a/script/install b/script/install
index ab1e004..5b81d30 100755
--- a/script/install
+++ b/script/install
@@ -97,8 +97,8 @@ if [ -L "$0" ]; then
 else
     dir=$(dirname "$0")
 fi
-install_dir="$dir/install.d"
 export DOTFILES=$(dirname "$dir")
+install_dir="$DOTFILES/install.d"
 
 # Set up log destination
 if [[ -z "$LOG_TARGET" ]]; then