diff --git a/flake.nix b/flake.nix
index 5ff4a24..0ec66ba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,13 +15,13 @@
         system = "x86_64-linux";
 
         modules = [
-          ./system/configuration.nix
+          ./hosts/configuration.nix
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
-	    home-manager.useUserPackages = true;
+	          home-manager.useUserPackages = true;
             home-manager.users.jordan = import ./users/jordan/home.nix;
-	  }
-	];
+	        }
+	      ];
       };
     };
   };
diff --git a/system/configuration.nix b/hosts/configuration.nix
similarity index 98%
rename from system/configuration.nix
rename to hosts/configuration.nix
index 36b934d..5ad923c 100644
--- a/system/configuration.nix
+++ b/hosts/configuration.nix
@@ -87,11 +87,13 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
+  users.defaultUserShell = pkgs.zsh;
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.jordan = {
     isNormalUser = true;
     description = "Jordan Holt";
     extraGroups = [ "networkmanager" "wheel" ];
+    useDefaultShell = true;
   };
 
   # Allow unfree packages
diff --git a/system/hardware-configuration.nix b/hosts/hardware-configuration.nix
similarity index 100%
rename from system/hardware-configuration.nix
rename to hosts/hardware-configuration.nix