diff --git a/config/home.nix b/config/home.nix
index 1fed9db..a44ab66 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -9,22 +9,22 @@
   ...
 }: {
   imports = [
-    ../moduler/common/dwm.nix
-    ../moduler/common/dmenu.nix
-    ../moduler/common/kitty.nix
-    ../moduler/common/tmux.nix
-    ../moduler/common/vim.nix
-    ../moduler/common/fish.nix 
-    ../moduler/common/git.nix
-    ../moduler/common/nixpkgs.nix
-    ../moduler/common/firefox.nix
-    ../moduler/common/zathura.nix
-    ../moduler/common/lazygit.nix
-    ../moduler/common/spotifyd.nix
-    ../moduler/common/ssh.nix
-    ../moduler/common/aerc.nix
-    ../moduler/common/rbw.nix
-    ../moduler/common/oh-my-posh.nix
+    ../shared/dwm.nix
+    ../shared/dmenu.nix
+    ../shared/kitty.nix
+    ../shared/tmux.nix
+    ../shared/vim.nix
+    ../shared/fish.nix 
+    ../shared/git.nix
+    ../shared/nixpkgs.nix
+    ../shared/firefox.nix
+    ../shared/zathura.nix
+    ../shared/lazygit.nix
+    ../shared/spotifyd.nix
+    ../shared/ssh.nix
+    ../shared/aerc.nix
+    ../shared/rbw.nix
+    ../shared/oh-my-posh.nix
   ];
 
   nixpkgs = {
diff --git a/config/server.nix b/config/server.nix
index 539bf5b..d6caca7 100644
--- a/config/server.nix
+++ b/config/server.nix
@@ -10,11 +10,11 @@
   ...
 }: {
   imports = [
-    ../moduler/common/git.nix
-    ../moduler/common/tmux.nix
-    ../moduler/common/nixpkgs.nix
-    ../moduler/common/lazygit.nix
-    ../moduler/common/zsh-server.nix
+    ../shared/git.nix
+    ../shared/tmux.nix
+    ../shared/nixpkgs.nix
+    ../shared/lazygit.nix
+    ../shared/zsh-server.nix
   ];
 
   nixpkgs = {
diff --git a/maskiner/desktop/configuration.nix b/maskiner/desktop/configuration.nix
index 63c112e..0b42202 100644
--- a/maskiner/desktop/configuration.nix
+++ b/maskiner/desktop/configuration.nix
@@ -13,7 +13,7 @@
     ./hardware-configuration.nix
 	../../config/base.nix
 	../../config/users.nix
-	../../moduler/common/nginx.nix
+	../../shared/nginx.nix
   ];
 
 	environment.systemPackages = with pkgs; [
diff --git a/maskiner/server/configuration.nix b/maskiner/server/configuration.nix
index 8634ecf..93a9c78 100644
--- a/maskiner/server/configuration.nix
+++ b/maskiner/server/configuration.nix
@@ -12,7 +12,7 @@
 	imports = [
 		./hardware-configuration.nix
 		../../config/users.nix
-		../../moduler/common/nginx.nix
+		../../shared/nginx.nix
 	];
 
 	networking.hostName = myhostname;
diff --git a/moduler/common/aerc.nix b/shared/aerc.nix
similarity index 100%
rename from moduler/common/aerc.nix
rename to shared/aerc.nix
diff --git a/moduler/common/dmenu.nix b/shared/dmenu.nix
similarity index 100%
rename from moduler/common/dmenu.nix
rename to shared/dmenu.nix
diff --git a/moduler/common/dunst/default.nix b/shared/dunst/default.nix
similarity index 100%
rename from moduler/common/dunst/default.nix
rename to shared/dunst/default.nix
diff --git a/moduler/common/dwm-2.nix b/shared/dwm-2.nix
similarity index 100%
rename from moduler/common/dwm-2.nix
rename to shared/dwm-2.nix
diff --git a/moduler/common/dwm.nix b/shared/dwm.nix
similarity index 100%
rename from moduler/common/dwm.nix
rename to shared/dwm.nix
diff --git a/moduler/common/firefox.nix b/shared/firefox.nix
similarity index 100%
rename from moduler/common/firefox.nix
rename to shared/firefox.nix
diff --git a/moduler/common/fish.nix b/shared/fish.nix
similarity index 66%
rename from moduler/common/fish.nix
rename to shared/fish.nix
index 346e7af..3824f7e 100644
--- a/moduler/common/fish.nix
+++ b/shared/fish.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
 	programs.fish = {
 		enable = true;
@@ -20,14 +20,6 @@
 			 name = "foreign-env";
 			 src = pkgs.fishPlugins.foreign-env.src;
 		   }
-		  #  {
-			 # name = "pure";
-			 # src = pkgs.fishPlugins.pure.src;
-		  #  }
-		  #  {
-			 # name = "tide";
-			 # src = pkgs.fishPlugins.tide.src;
-		  #  }
 		   {
 		   	 name = "fzf";
 			 src = pkgs.fishPlugins.fzf.src;
@@ -50,20 +42,11 @@
 		  ls="exa -lag --header";
 		  dev="nix develop --command fish";
 		  spot="steam-run ~/program/spotify_player";
+		  sc="sc-im";
 	  };
 	  interactiveShellInit = ''
 		set fish_greeting # Disable greeting
 		set -Ux FZF_DEFAULT_OPTS "--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4"
-		# set --universal pure_symbol_prompt 
-		# set --universal pure_enable_nixdevshell true
-		# set --universal pure_color_primary f5a97f
-		# set --universal pure_color_danger ed8796
-		# set --universal pure_color_success a6da95
-		# set --universal pure_color_warning eed49f
-		# set --universal pure_color_light f4dbd6
-		# set --universal pure_color_mute c6a0f6
-		# set --universal pure_color_danger ed8796
-		# set --universal pure_color_danger ed8796
 	  '';
 	};
 }
diff --git a/moduler/common/git.nix b/shared/git.nix
similarity index 100%
rename from moduler/common/git.nix
rename to shared/git.nix
diff --git a/moduler/common/i3.nix b/shared/i3.nix
similarity index 100%
rename from moduler/common/i3.nix
rename to shared/i3.nix
diff --git a/moduler/common/kitty.nix b/shared/kitty.nix
similarity index 100%
rename from moduler/common/kitty.nix
rename to shared/kitty.nix
diff --git a/moduler/common/lazygit.nix b/shared/lazygit.nix
similarity index 100%
rename from moduler/common/lazygit.nix
rename to shared/lazygit.nix
diff --git a/moduler/common/neovim/config/mappings.lua b/shared/neovim/config/mappings.lua
similarity index 100%
rename from moduler/common/neovim/config/mappings.lua
rename to shared/neovim/config/mappings.lua
diff --git a/moduler/common/neovim/config/options.lua b/shared/neovim/config/options.lua
similarity index 100%
rename from moduler/common/neovim/config/options.lua
rename to shared/neovim/config/options.lua
diff --git a/moduler/common/neovim/config/plugins.lua b/shared/neovim/config/plugins.lua
similarity index 100%
rename from moduler/common/neovim/config/plugins.lua
rename to shared/neovim/config/plugins.lua
diff --git a/moduler/common/neovim/config/setup.lua b/shared/neovim/config/setup.lua
similarity index 100%
rename from moduler/common/neovim/config/setup.lua
rename to shared/neovim/config/setup.lua
diff --git a/moduler/common/nginx.nix b/shared/nginx.nix
similarity index 100%
rename from moduler/common/nginx.nix
rename to shared/nginx.nix
diff --git a/moduler/common/nh.nix b/shared/nh.nix
similarity index 100%
rename from moduler/common/nh.nix
rename to shared/nh.nix
diff --git a/moduler/common/nixpkgs.nix b/shared/nixpkgs.nix
similarity index 100%
rename from moduler/common/nixpkgs.nix
rename to shared/nixpkgs.nix
diff --git a/moduler/common/nvim.nix b/shared/nvim.nix
similarity index 100%
rename from moduler/common/nvim.nix
rename to shared/nvim.nix
diff --git a/moduler/common/oh-my-posh.nix b/shared/oh-my-posh.nix
similarity index 100%
rename from moduler/common/oh-my-posh.nix
rename to shared/oh-my-posh.nix
diff --git a/moduler/common/rbw.nix b/shared/rbw.nix
similarity index 100%
rename from moduler/common/rbw.nix
rename to shared/rbw.nix
diff --git a/moduler/common/spotifyd.nix b/shared/spotifyd.nix
similarity index 100%
rename from moduler/common/spotifyd.nix
rename to shared/spotifyd.nix
diff --git a/moduler/common/ssh.nix b/shared/ssh.nix
similarity index 100%
rename from moduler/common/ssh.nix
rename to shared/ssh.nix
diff --git a/moduler/common/starship.nix b/shared/starship.nix
similarity index 100%
rename from moduler/common/starship.nix
rename to shared/starship.nix
diff --git a/moduler/common/tmux.nix b/shared/tmux.nix
similarity index 100%
rename from moduler/common/tmux.nix
rename to shared/tmux.nix
diff --git a/moduler/common/vim.nix b/shared/vim.nix
similarity index 100%
rename from moduler/common/vim.nix
rename to shared/vim.nix
diff --git a/moduler/common/zathura.nix b/shared/zathura.nix
similarity index 100%
rename from moduler/common/zathura.nix
rename to shared/zathura.nix
diff --git a/moduler/common/zsh-server.nix b/shared/zsh-server.nix
similarity index 100%
rename from moduler/common/zsh-server.nix
rename to shared/zsh-server.nix
diff --git a/moduler/common/zsh.nix b/shared/zsh.nix
similarity index 100%
rename from moduler/common/zsh.nix
rename to shared/zsh.nix