diff --git a/hosts/gampo/configuration.nix b/hosts/gampo/configuration.nix
index 0dac171..d7d333e 100644
--- a/hosts/gampo/configuration.nix
+++ b/hosts/gampo/configuration.nix
@@ -1,6 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
 {
   config,
   pkgs,
@@ -9,11 +6,13 @@
 }: {
   imports = [
     inputs.sops-nix.nixosModules.sops
-    ./system/hardware-configuration.nix
-    ./services.nix
-    ../../modules/system.nix
-    ../../modules/sops.nix
+    ./hardware-configuration.nix
+    ./services
     ../../modules/opentablet.nix
+    ../../modules/sops.nix
+    ../../modules/system.nix
+    ../../programs/flatpak.nix
+    ../../programs/hyprland.nix
     ../../programs/steam.nix
   ];
 
@@ -40,6 +39,8 @@
     sound.enable = true;
   };
 
+  modules.hyprland.enable = true;
+
   security.rtkit.enable = true;
 
   # List packages installed in system profile. To search, run:
diff --git a/hosts/gampo/system/hardware-configuration.nix b/hosts/gampo/hardware-configuration.nix
similarity index 100%
rename from hosts/gampo/system/hardware-configuration.nix
rename to hosts/gampo/hardware-configuration.nix
diff --git a/hosts/gampo/services.nix b/hosts/gampo/services/default.nix
similarity index 92%
rename from hosts/gampo/services.nix
rename to hosts/gampo/services/default.nix
index a7b87fa..dcca4dd 100644
--- a/hosts/gampo/services.nix
+++ b/hosts/gampo/services/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ./services/gnome.nix
+    ./gnome.nix
   ];
 
   services = {