diff --git a/flake.nix b/flake.nix
index bf0625a..dfbdd6a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
       nemesis = nixpkgs.lib.nixosSystem {
         specialArgs = args;
         modules = [ 
-          ./hosts/nemesis 
+          ./systems/nemesis 
           
           # Add the home-manager user
           home-manager.nixosModules.home-manager {
@@ -39,7 +39,7 @@
     # Packages
     packages.x86_64-linux.nvf = (inputs.nvf.lib.neovimConfiguration { 
       pkgs = nixpkgs.legacyPackages.x86_64-linux;
-      modules = [ ./modules/nvf.nix ]; 
+      modules = [ ./packages/nvf.nix ]; 
     }).neovim;
   };
 
diff --git a/modules/nvf.nix b/packages/nvf.nix
similarity index 100%
rename from modules/nvf.nix
rename to packages/nvf.nix
diff --git a/hosts/nemesis/default.nix b/systems/nemesis/default.nix
similarity index 100%
rename from hosts/nemesis/default.nix
rename to systems/nemesis/default.nix
diff --git a/hosts/nemesis/hardware-configuration.nix b/systems/nemesis/hardware-configuration.nix
similarity index 100%
rename from hosts/nemesis/hardware-configuration.nix
rename to systems/nemesis/hardware-configuration.nix