diff --git a/gentoo/etc/conf.d/display-manager b/os/gentoo/etc/conf.d/display-manager
similarity index 100%
rename from gentoo/etc/conf.d/display-manager
rename to os/gentoo/etc/conf.d/display-manager
diff --git a/gentoo/etc/env.d/90xsession b/os/gentoo/etc/env.d/90xsession
similarity index 100%
rename from gentoo/etc/env.d/90xsession
rename to os/gentoo/etc/env.d/90xsession
diff --git a/gentoo/etc/portage/make.conf b/os/gentoo/etc/portage/make.conf
similarity index 100%
rename from gentoo/etc/portage/make.conf
rename to os/gentoo/etc/portage/make.conf
diff --git a/gentoo/etc/portage/package.accept_keywords/package.accept_keywords b/os/gentoo/etc/portage/package.accept_keywords/package.accept_keywords
similarity index 100%
rename from gentoo/etc/portage/package.accept_keywords/package.accept_keywords
rename to os/gentoo/etc/portage/package.accept_keywords/package.accept_keywords
diff --git a/gentoo/etc/portage/package.license b/os/gentoo/etc/portage/package.license
similarity index 100%
rename from gentoo/etc/portage/package.license
rename to os/gentoo/etc/portage/package.license
diff --git a/gentoo/etc/portage/package.mask/toolchains b/os/gentoo/etc/portage/package.mask/toolchains
similarity index 100%
rename from gentoo/etc/portage/package.mask/toolchains
rename to os/gentoo/etc/portage/package.mask/toolchains
diff --git a/gentoo/etc/portage/package.use/toolchains b/os/gentoo/etc/portage/package.use/toolchains
similarity index 100%
rename from gentoo/etc/portage/package.use/toolchains
rename to os/gentoo/etc/portage/package.use/toolchains
diff --git a/gentoo/etc/portage/package.use/zz-autounmask b/os/gentoo/etc/portage/package.use/zz-autounmask
similarity index 100%
rename from gentoo/etc/portage/package.use/zz-autounmask
rename to os/gentoo/etc/portage/package.use/zz-autounmask
diff --git a/gentoo/var/lib/portage/world b/os/gentoo/var/lib/portage/world
similarity index 100%
rename from gentoo/var/lib/portage/world
rename to os/gentoo/var/lib/portage/world
diff --git a/fish/conf.d/rvm.fish b/software/fish/conf.d/rvm.fish
similarity index 100%
rename from fish/conf.d/rvm.fish
rename to software/fish/conf.d/rvm.fish
diff --git a/fish/config.fish b/software/fish/config.fish
similarity index 100%
rename from fish/config.fish
rename to software/fish/config.fish
diff --git a/fish/functions/fish_prompt.fish b/software/fish/functions/fish_prompt.fish
similarity index 100%
rename from fish/functions/fish_prompt.fish
rename to software/fish/functions/fish_prompt.fish
diff --git a/fish/functions/prompt_user_host.fish b/software/fish/functions/prompt_user_host.fish
similarity index 100%
rename from fish/functions/prompt_user_host.fish
rename to software/fish/functions/prompt_user_host.fish
diff --git a/fish/functions/rvm.fish b/software/fish/functions/rvm.fish
similarity index 100%
rename from fish/functions/rvm.fish
rename to software/fish/functions/rvm.fish
diff --git a/nvim/init.vim b/software/nvim/init.vim
similarity index 100%
rename from nvim/init.vim
rename to software/nvim/init.vim
diff --git a/tmux/tmux.conf b/software/tmux/tmux.conf
similarity index 100%
rename from tmux/tmux.conf
rename to software/tmux/tmux.conf