diff --git a/common/Desktop Manager/gnome.nix b/desktop/gnome.nix
similarity index 83%
rename from common/Desktop Manager/gnome.nix
rename to desktop/gnome.nix
index 68f7f9f..0c71d50 100644
--- a/common/Desktop Manager/gnome.nix	
+++ b/desktop/gnome.nix
@@ -1,7 +1,6 @@
 { config, pkgs, ... }:
 
 {  
-  # Enable the GNOME Desktop Environment.
   services.xserver.desktopManager.gnome.enable = true;
   
   environment.systemPackages = with pkgs;[
diff --git a/common/Desktop Manager/hyperland.nix b/desktop/hyperland.nix
similarity index 100%
rename from common/Desktop Manager/hyperland.nix
rename to desktop/hyperland.nix
diff --git a/common/Desktop Manager/kde.nix b/desktop/kde.nix
similarity index 62%
rename from common/Desktop Manager/kde.nix
rename to desktop/kde.nix
index db7ec46..7eccc64 100644
--- a/common/Desktop Manager/kde.nix	
+++ b/desktop/kde.nix
@@ -1,5 +1,5 @@
 { config, pkgs, ... }:
 
-{  # Enable the KDE Plasma Desktop Environment.
+{  
   services.xserver.desktopManager.plasma5.enable = true;
 }
\ No newline at end of file
diff --git a/common/Display Manager/gdm.nix b/display/gdm.nix
similarity index 65%
rename from common/Display Manager/gdm.nix
rename to display/gdm.nix
index d3b8912..c071f86 100644
--- a/common/Display Manager/gdm.nix	
+++ b/display/gdm.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }:
 
 {  
-  # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true;
 }
\ No newline at end of file
diff --git a/common/Display Manager/sddm.nix b/display/sddm.nix
similarity index 63%
rename from common/Display Manager/sddm.nix
rename to display/sddm.nix
index 183004b..1b15165 100644
--- a/common/Display Manager/sddm.nix	
+++ b/display/sddm.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }:
 
 {  
-  # Enable the KDE Plasma Desktop Environment.
   services.xserver.displayManager.sddm.enable = true;
 }
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 0ce351e..43f7bbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,11 +23,11 @@
           # Common Resources
 
           # Desktop
-          ./common/Desktop Manager/gnome.nix
-          ./common/Display Manager/gdm.nix
-          #./common/Desktop Manager/kde.nix
-          #./common/Display Manager/sddm.nix
-          #./common/Desktop Manager/hyperland.nix
+          ./desktop/gnome.nix
+          ./display/gdm.nix
+          #./desktop/kde.nix
+          #./display/sddm.nix
+          #./desktop/hyperland.nix
           
           # Modules
           ./common/amd.nix
@@ -69,11 +69,11 @@
           # Common Resources
 
           # Desktop
-          #./common/Desktop Manager/gnome.nix
-          #./common/Display Manager/gdm.nix
-          ./common/Desktop Manager/kde.nix
-          ./common/Display Manager/sddm.nix
-          #./common/Desktop Manager/hyperland.nix
+          ./desktop/gnome.nix
+          ./display/gdm.nix
+          ./desktop/kde.nix
+          ./display/sddm.nix
+          #./desktop/hyperland.nix
           
           # Modules          
           #./common/amd.nix
@@ -116,11 +116,11 @@
           # Common Resources
 
           # Desktop
-          ./common/Desktop Manager/gnome.nix
-          ./common/Display Manager/gdm.nix
-          #./common/Desktop Manager/kde.nix
-          #./common/Display Manager/sddm.nix
-          #./common/Desktop Manager/hyperland.nix
+          ./desktop/gnome.nix
+          ./display/gdm.nix
+          #./desktop/kde.nix
+          #./display/sddm.nix
+          #./desktop/hyperland.nix
 
           # Modules          
           ./common/amd.nix
@@ -162,11 +162,11 @@
           # Common Resources
 
           # Desktop
-          ./common/Desktop Manager/gnome.nix
-          ./common/Display Manager/gdm.nix
-          #./common/Desktop Manager/kde.nix
-          #./common/Display Manager/sddm.nix
-          #./common/Desktop Manager/hyperland.nix
+          ./desktop/gnome.nix
+          ./display/gdm.nix
+          #./desktop/kde.nix
+          #./display/sddm.nix
+          #./desktop/hyperland.nix
 
           # Modules                    
           ./common/amd.nix