diff --git a/nvim/init.lua b/editors/nvim/init.lua
similarity index 100%
rename from nvim/init.lua
rename to editors/nvim/init.lua
diff --git a/nvim/lua/config/lazy.lua b/editors/nvim/lua/config/lazy.lua
similarity index 100%
rename from nvim/lua/config/lazy.lua
rename to editors/nvim/lua/config/lazy.lua
diff --git a/nvim/lua/config/mappings.lua b/editors/nvim/lua/config/mappings.lua
similarity index 100%
rename from nvim/lua/config/mappings.lua
rename to editors/nvim/lua/config/mappings.lua
diff --git a/nvim/lua/config/options.lua b/editors/nvim/lua/config/options.lua
similarity index 100%
rename from nvim/lua/config/options.lua
rename to editors/nvim/lua/config/options.lua
diff --git a/nvim/lua/plugins/colourscheme.lua b/editors/nvim/lua/plugins/colourscheme.lua
similarity index 100%
rename from nvim/lua/plugins/colourscheme.lua
rename to editors/nvim/lua/plugins/colourscheme.lua
diff --git a/nvim/lua/plugins/treesitter.lua b/editors/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from nvim/lua/plugins/treesitter.lua
rename to editors/nvim/lua/plugins/treesitter.lua
diff --git a/meta/configs/bash-config.yaml b/meta/configs/bash-config.yaml
index 4ef78c0..ca9bdcf 100644
--- a/meta/configs/bash-config.yaml
+++ b/meta/configs/bash-config.yaml
@@ -1,2 +1,2 @@
 - link:
-    ~/.bashrc: bashrc
+    ~/.bashrc: shell/bash/bashrc
diff --git a/meta/configs/nvim-config.yaml b/meta/configs/nvim-config.yaml
index d936e3d..d3596f7 100644
--- a/meta/configs/nvim-config.yaml
+++ b/meta/configs/nvim-config.yaml
@@ -1,4 +1,4 @@
 - link:
     ~/.config/nvim:
       create: true
-      path: nvim
+      path: editors/nvim
diff --git a/meta/configs/tmux-config.yaml b/meta/configs/tmux-config.yaml
index 8144c78..0e833be 100644
--- a/meta/configs/tmux-config.yaml
+++ b/meta/configs/tmux-config.yaml
@@ -1,2 +1,2 @@
 - link:
-    ~/.tmux.conf: tmux.conf
+    ~/.tmux.conf: shell/tmux/tmux.conf
diff --git a/meta/configs/ui-config.yaml b/meta/configs/ui-config.yaml
index 10c3924..d058341 100644
--- a/meta/configs/ui-config.yaml
+++ b/meta/configs/ui-config.yaml
@@ -1,9 +1,7 @@
 # update ubuntu dock with default preferred shortcuts
 - shell:
     - gsettings set org.gnome.shell favorite-apps "['firefox_firefox.desktop', 'thunderbird_thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'code_code.desktop', 'org.gnome.Terminal.desktop', 'spotify_spotify.desktop', 'bitwarden_bitwarden.desktop']"
-    - dconf load /org/gnome/terminal/legacy/profiles:/ < gnome-terminal-profiles.dconf
-    - gsettings set org.gnome.desktop.background picture-uri "file://$(realpath ".")/wallpaper.jpg"
-    - gsettings set org.gnome.desktop.background picture-uri-dark "file://$(realpath ".")/wallpaper.jpg"
-    - gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-    - gsettings set org.gnome.desktop.interface icon-theme "Yaru-viridian"
-    - gsettings set org.gnome.desktop.interface gtk-theme "Yaru-viridian-dark"
+    - dconf load /org/gnome/terminal/legacy/profiles:/ < ui/gnome/gnome-terminal-profiles.dconf
+    - dconf load /org/gnome/desktop/interface/ < ui/gnome/gnome-desktop-interface.dconf
+    - gsettings set org.gnome.desktop.background picture-uri "file://$(realpath ".")/ui/wallpapers/swirls.jpg"
+    - gsettings set org.gnome.desktop.background picture-uri-dark "file://$(realpath ".")/ui/wallpapers/swirls.jpg"
diff --git a/meta/configs/zsh-config.yaml b/meta/configs/zsh-config.yaml
index 6c1d5d9..77e5d45 100644
--- a/meta/configs/zsh-config.yaml
+++ b/meta/configs/zsh-config.yaml
@@ -21,5 +21,5 @@
       description: 'oh my zsh - syntax highlighting'
 
 - link:
-    ~/.zshrc: zshrc
-    ~/.p10k.zsh: p10k.zsh
+    ~/.zshrc: shell/zsh/zshrc
+    ~/.p10k.zsh: shell/zsh/p10k.zsh
diff --git a/bashrc b/shell/bash/bashrc
similarity index 100%
rename from bashrc
rename to shell/bash/bashrc
diff --git a/tmux.conf b/shell/tmux/tmux.conf
similarity index 100%
rename from tmux.conf
rename to shell/tmux/tmux.conf
diff --git a/p10k.zsh b/shell/zsh/p10k.zsh
similarity index 100%
rename from p10k.zsh
rename to shell/zsh/p10k.zsh
diff --git a/zshrc b/shell/zsh/zshrc
similarity index 100%
rename from zshrc
rename to shell/zsh/zshrc
diff --git a/ui/gnome/gnome-desktop-interface.dconf b/ui/gnome/gnome-desktop-interface.dconf
new file mode 100644
index 0000000..7ee9f9c
--- /dev/null
+++ b/ui/gnome/gnome-desktop-interface.dconf
@@ -0,0 +1,4 @@
+[/]
+color-scheme='prefer-dark'
+gtk-theme='Yaru-viridian-dark'
+icon-theme='Yaru-viridian'
diff --git a/gnome-terminal-profiles.dconf b/ui/gnome/gnome-terminal-profiles.dconf
similarity index 100%
rename from gnome-terminal-profiles.dconf
rename to ui/gnome/gnome-terminal-profiles.dconf
diff --git a/wallpaper.jpg b/ui/wallpapers/swirls.jpg
similarity index 100%
rename from wallpaper.jpg
rename to ui/wallpapers/swirls.jpg