diff --git a/README.org b/README.org
index 1be576d..8fb8d57 100644
--- a/README.org
+++ b/README.org
@@ -62,19 +62,20 @@
     inherit system;
 
     modules = [
-      ./system/configuration.nix
+      ./hosts/desktop
+
       home-manager.nixosModules.home-manager
       {
-	home-manager = {
-		useGlobalPkgs = true;
-		useUserPackages = true;
-		users.pedro = import ./home-manager {
-			config = self;
-			pkgs = pkgs;
-			username = users.pedro.username;
-			stateVersion = stateVersion;
-		};
-	};
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.pedro = import ./home {
+            config = self;
+            pkgs = pkgs;
+            username = users.pedro.username;
+            stateVersion = stateVersion;
+          };
+        };
       }
     ];
   };
diff --git a/flake.nix b/flake.nix
index a52911b..1cfa026 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,18 +24,19 @@
       inherit system;
     
       modules = [
-        ./system/configuration.nix
+        ./hosts/desktop
+    
         home-manager.nixosModules.home-manager
         {
           home-manager = {
-    	      useGlobalPkgs = true;
-    	      useUserPackages = true;
-    	      users.pedro = import ./home-manager {
-    		      config = self;
-    		      pkgs = pkgs;
-    		      username = users.pedro.username;
-    		      stateVersion = stateVersion;
-    	      };
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            users.pedro = import ./home {
+              config = self;
+              pkgs = pkgs;
+              username = users.pedro.username;
+              stateVersion = stateVersion;
+            };
           };
         }
       ];
diff --git a/home-manager/alacritty/default.nix b/home/alacritty/default.nix
similarity index 100%
rename from home-manager/alacritty/default.nix
rename to home/alacritty/default.nix
diff --git a/home-manager/default.nix b/home/default.nix
similarity index 100%
rename from home-manager/default.nix
rename to home/default.nix
diff --git a/home-manager/emacs/default.nix b/home/emacs/default.nix
similarity index 100%
rename from home-manager/emacs/default.nix
rename to home/emacs/default.nix
diff --git a/home-manager/emacs/emacs.org b/home/emacs/emacs.org
similarity index 100%
rename from home-manager/emacs/emacs.org
rename to home/emacs/emacs.org
diff --git a/home-manager/firefox/default.nix b/home/firefox/default.nix
similarity index 100%
rename from home-manager/firefox/default.nix
rename to home/firefox/default.nix
diff --git a/home-manager/git/default.nix b/home/git/default.nix
similarity index 100%
rename from home-manager/git/default.nix
rename to home/git/default.nix
diff --git a/home-manager/git/message b/home/git/message
similarity index 100%
rename from home-manager/git/message
rename to home/git/message
diff --git a/home-manager/neovim/colors/Blaaark.vim b/home/neovim/colors/Blaaark.vim
similarity index 100%
rename from home-manager/neovim/colors/Blaaark.vim
rename to home/neovim/colors/Blaaark.vim
diff --git a/home-manager/neovim/colors/hashpunk-lapis.vim b/home/neovim/colors/hashpunk-lapis.vim
similarity index 100%
rename from home-manager/neovim/colors/hashpunk-lapis.vim
rename to home/neovim/colors/hashpunk-lapis.vim
diff --git a/home-manager/neovim/colors/monotonic.vim b/home/neovim/colors/monotonic.vim
similarity index 100%
rename from home-manager/neovim/colors/monotonic.vim
rename to home/neovim/colors/monotonic.vim
diff --git a/home-manager/neovim/colors/nighted.vim b/home/neovim/colors/nighted.vim
similarity index 100%
rename from home-manager/neovim/colors/nighted.vim
rename to home/neovim/colors/nighted.vim
diff --git a/home-manager/neovim/colors/photon.vim b/home/neovim/colors/photon.vim
similarity index 100%
rename from home-manager/neovim/colors/photon.vim
rename to home/neovim/colors/photon.vim
diff --git a/home-manager/neovim/colors/spartan.vim b/home/neovim/colors/spartan.vim
similarity index 100%
rename from home-manager/neovim/colors/spartan.vim
rename to home/neovim/colors/spartan.vim
diff --git a/home-manager/neovim/config/ale.vim b/home/neovim/config/ale.vim
similarity index 100%
rename from home-manager/neovim/config/ale.vim
rename to home/neovim/config/ale.vim
diff --git a/home-manager/neovim/config/aliases.vim b/home/neovim/config/aliases.vim
similarity index 100%
rename from home-manager/neovim/config/aliases.vim
rename to home/neovim/config/aliases.vim
diff --git a/home-manager/neovim/config/bundles.vim b/home/neovim/config/bundles.vim
similarity index 100%
rename from home-manager/neovim/config/bundles.vim
rename to home/neovim/config/bundles.vim
diff --git a/home-manager/neovim/config/coc.vim b/home/neovim/config/coc.vim
similarity index 100%
rename from home-manager/neovim/config/coc.vim
rename to home/neovim/config/coc.vim
diff --git a/home-manager/neovim/config/filetypes.vim b/home/neovim/config/filetypes.vim
similarity index 100%
rename from home-manager/neovim/config/filetypes.vim
rename to home/neovim/config/filetypes.vim
diff --git a/home-manager/neovim/config/nerdtree.vim b/home/neovim/config/nerdtree.vim
similarity index 100%
rename from home-manager/neovim/config/nerdtree.vim
rename to home/neovim/config/nerdtree.vim
diff --git a/home-manager/neovim/config/skeletons.vim b/home/neovim/config/skeletons.vim
similarity index 100%
rename from home-manager/neovim/config/skeletons.vim
rename to home/neovim/config/skeletons.vim
diff --git a/home-manager/neovim/config/test.vim b/home/neovim/config/test.vim
similarity index 100%
rename from home-manager/neovim/config/test.vim
rename to home/neovim/config/test.vim
diff --git a/home-manager/neovim/default.nix b/home/neovim/default.nix
similarity index 100%
rename from home-manager/neovim/default.nix
rename to home/neovim/default.nix
diff --git a/home-manager/neovim/skeletons/.skeleton.html b/home/neovim/skeletons/.skeleton.html
similarity index 100%
rename from home-manager/neovim/skeletons/.skeleton.html
rename to home/neovim/skeletons/.skeleton.html
diff --git a/home-manager/neovim/skeletons/.skeleton.py b/home/neovim/skeletons/.skeleton.py
similarity index 100%
rename from home-manager/neovim/skeletons/.skeleton.py
rename to home/neovim/skeletons/.skeleton.py
diff --git a/home-manager/neovim/skeletons/.skeleton.tex b/home/neovim/skeletons/.skeleton.tex
similarity index 100%
rename from home-manager/neovim/skeletons/.skeleton.tex
rename to home/neovim/skeletons/.skeleton.tex
diff --git a/home-manager/neovim/skeletons/.skeleton.vue.test b/home/neovim/skeletons/.skeleton.vue.test
similarity index 100%
rename from home-manager/neovim/skeletons/.skeleton.vue.test
rename to home/neovim/skeletons/.skeleton.vue.test
diff --git a/home-manager/neovim/vimrc b/home/neovim/vimrc
similarity index 100%
rename from home-manager/neovim/vimrc
rename to home/neovim/vimrc
diff --git a/home-manager/vscode/default.nix b/home/vscode/default.nix
similarity index 100%
rename from home-manager/vscode/default.nix
rename to home/vscode/default.nix
diff --git a/system/configuration.nix b/hosts/desktop/default.nix
similarity index 100%
rename from system/configuration.nix
rename to hosts/desktop/default.nix
diff --git a/system/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
similarity index 100%
rename from system/hardware-configuration.nix
rename to hosts/desktop/hardware-configuration.nix