diff --git a/Makefile b/Makefile
index 867a668..408aaa3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BUILD_COMMIT       = $(shell git rev-parse HEAD)
 BASE_IMAGE         = registry.fedoraproject.org/fedora-toolbox
 BASE_IMAGE_VERSION = $(shell cat /etc/os-release | grep VERSION_ID | cut -d = -f 2)
 REPOSITORY         = localhost/toolbox-dev-env
-STARSHIP_COLOR     = $(shell cat starship.$(HOSTNAME).color)
+STARSHIP_COLOR     = $(shell cat shell/starship.$(HOSTNAME).color)
 
 .PHONY: toolbox
 toolbox:
@@ -12,8 +12,8 @@ toolbox:
 	systemctl --user enable podman.socket --now
 	systemctl --user enable podman.service --now
 
-.PHONY: container
-scripts:
+.PHONY: shell
+shell:
 	mkdir --parents ~/.local/share/fonts/
 	curl -sSLo ~/.local/share/fonts/nerdfont.zip https://github.com/ryanoasis/nerd-fonts/releases/download/v3.4.0/AdwaitaMono.zip
 	unzip -o ~/.local/share/fonts/nerdfont.zip -d ~/.local/share/fonts/
@@ -25,14 +25,14 @@ scripts:
 	sh /tmp/starship.sh --yes --bin-dir=$(HOME)/.local/bin
 
 	mkdir --parents ~/.config/bashrc.d
-	cp scripts.d/*.sh ~/.config/bashrc.d/
+	cp shell/scripts.d/*.sh ~/.config/bashrc.d/
 
 	mkdir --parents ~/.config/completions.d
-	cp completions.d/*.completion ~/.config/completions.d/
+	cp shell/completions.d/*.completion ~/.config/completions.d/
 
-	cp bashrc.sh ~/.bashrc
-	cp inputrc ~/.inputrc
-	cp starship.toml ~/.config/starship.toml
+	cp shell/bashrc.sh ~/.bashrc
+	cp shell/inputrc ~/.inputrc
+	cp shell/starship.toml ~/.config/starship.toml
 	sed -i "s/#XXXXXX/$(STARSHIP_COLOR)/g" ~/.config/starship.toml
 
 .PHONY: vscodium
@@ -47,5 +47,5 @@ vscodium:
 	podman rm vscodium-setup-temp
 
 .PHONY: install
-install: toolbox scripts;
+install: toolbox shell;
 
diff --git a/bashrc.sh b/shell/bashrc.sh
similarity index 100%
rename from bashrc.sh
rename to shell/bashrc.sh
diff --git a/completions.d/dev.completion b/shell/completions.d/dev.completion
similarity index 100%
rename from completions.d/dev.completion
rename to shell/completions.d/dev.completion
diff --git a/inputrc b/shell/inputrc
similarity index 100%
rename from inputrc
rename to shell/inputrc
diff --git a/scripts.d/00-directories.sh b/shell/scripts.d/00-directories.sh
similarity index 100%
rename from scripts.d/00-directories.sh
rename to shell/scripts.d/00-directories.sh
diff --git a/scripts.d/01-aliases.sh b/shell/scripts.d/01-aliases.sh
similarity index 100%
rename from scripts.d/01-aliases.sh
rename to shell/scripts.d/01-aliases.sh
diff --git a/scripts.d/02-direnv.sh b/shell/scripts.d/02-direnv.sh
similarity index 100%
rename from scripts.d/02-direnv.sh
rename to shell/scripts.d/02-direnv.sh
diff --git a/scripts.d/10-cardstat.sh b/shell/scripts.d/10-cardstat.sh
similarity index 100%
rename from scripts.d/10-cardstat.sh
rename to shell/scripts.d/10-cardstat.sh
diff --git a/scripts.d/10-random.sh b/shell/scripts.d/10-random.sh
similarity index 100%
rename from scripts.d/10-random.sh
rename to shell/scripts.d/10-random.sh
diff --git a/scripts.d/10-starship.sh b/shell/scripts.d/10-starship.sh
similarity index 100%
rename from scripts.d/10-starship.sh
rename to shell/scripts.d/10-starship.sh
diff --git a/scripts.d/10-up.sh b/shell/scripts.d/10-up.sh
similarity index 100%
rename from scripts.d/10-up.sh
rename to shell/scripts.d/10-up.sh
diff --git a/scripts.d/50-dev.sh b/shell/scripts.d/50-dev.sh
similarity index 100%
rename from scripts.d/50-dev.sh
rename to shell/scripts.d/50-dev.sh
diff --git a/scripts.d/99-local.sh b/shell/scripts.d/99-local.sh
similarity index 100%
rename from scripts.d/99-local.sh
rename to shell/scripts.d/99-local.sh
diff --git a/starship.discovery.color b/shell/starship.discovery.color
similarity index 100%
rename from starship.discovery.color
rename to shell/starship.discovery.color
diff --git a/starship.endeavor.color b/shell/starship.endeavor.color
similarity index 100%
rename from starship.endeavor.color
rename to shell/starship.endeavor.color
diff --git a/starship.toml b/shell/starship.toml
similarity index 100%
rename from starship.toml
rename to shell/starship.toml