diff --git a/flake.nix b/flake.nix
index ac746eb..0ed7e0c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "fqbn207 shitty NixOS Configuration lol";
+  description = "Sojus07 shitty NixOS Configuration lol";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -17,7 +17,7 @@
     nixosConfigurations.default = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./hosts/default/configuration.nix
+        ./hosts/computer/configuration.nix
         nvf.nixosModules.default
         home-manager.nixosModules.home-manager
         {
diff --git a/hosts/computer/configuration.nix b/hosts/computer/configuration.nix
index 9d048c1..c553f6f 100644
--- a/hosts/computer/configuration.nix
+++ b/hosts/computer/configuration.nix
@@ -7,7 +7,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./modules/system/nix/default.nix
+    ./modules/default.nix
   ];
 
   nixpkgs = {
@@ -52,7 +52,7 @@
 
   environment.etc = {
     "makepkg.conf".source = "${pkgs.pacman}/etc/makepkg.conf";
-    "pacman.conf".source = ./modules/system/raw/pacman.conf;
+    "pacman.conf".source = ../default/raw/pacman.conf;
   };
 
   system.stateVersion = "unstable";
diff --git a/hosts/computer/modules/system/nix/boot.nix b/hosts/computer/modules/boot.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/boot.nix
rename to hosts/computer/modules/boot.nix
diff --git a/hosts/computer/modules/system/nix/default.nix b/hosts/computer/modules/default.nix
similarity index 69%
rename from hosts/computer/modules/system/nix/default.nix
rename to hosts/computer/modules/default.nix
index 0625caa..6ee36e4 100644
--- a/hosts/computer/modules/system/nix/default.nix
+++ b/hosts/computer/modules/default.nix
@@ -4,8 +4,7 @@
   ...
 }: {
   imports = [
-    ../../../../default/windowManager/dwm/default.nix
-    ../../../../default/editors/nvim/default.nix
+    
     ./nvim/default.nix
     ./networking.nix
     ./users.nix
diff --git a/hosts/computer/modules/system/nix/firefox.nix b/hosts/computer/modules/firefox.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/firefox.nix
rename to hosts/computer/modules/firefox.nix
diff --git a/hosts/computer/modules/system/nix/gaming.nix b/hosts/computer/modules/gaming.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/gaming.nix
rename to hosts/computer/modules/gaming.nix
diff --git a/hosts/computer/modules/system/nix/hw.nix b/hosts/computer/modules/hw.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/hw.nix
rename to hosts/computer/modules/hw.nix
diff --git a/hosts/computer/modules/system/nix/networking.nix b/hosts/computer/modules/networking.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/networking.nix
rename to hosts/computer/modules/networking.nix
diff --git a/hosts/computer/modules/system/nix/pkgs.nix b/hosts/computer/modules/pkgs.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/pkgs.nix
rename to hosts/computer/modules/pkgs.nix
diff --git a/hosts/computer/modules/system/nix/sec.nix b/hosts/computer/modules/sec.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/sec.nix
rename to hosts/computer/modules/sec.nix
diff --git a/hosts/computer/modules/system/nix/services.nix b/hosts/computer/modules/services.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/services.nix
rename to hosts/computer/modules/services.nix
diff --git a/hosts/computer/modules/system/nix/users.nix b/hosts/computer/modules/users.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/users.nix
rename to hosts/computer/modules/users.nix
diff --git a/hosts/computer/modules/system/nix/virt.nix b/hosts/computer/modules/virt.nix
similarity index 100%
rename from hosts/computer/modules/system/nix/virt.nix
rename to hosts/computer/modules/virt.nix
diff --git a/hosts/default/default.nix b/hosts/default/default.nix
new file mode 100644
index 0000000..87d5f9c
--- /dev/null
+++ b/hosts/default/default.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    ./windowManager/dwm/default.nix
+    ./editors/nvim/default.nix
+  ];
+}
diff --git a/hosts/computer/modules/system/raw/pacman.conf b/hosts/default/raw/pacman.conf
similarity index 100%
rename from hosts/computer/modules/system/raw/pacman.conf
rename to hosts/default/raw/pacman.conf
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index c3bdfb6..5b85d91 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -7,7 +7,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./modules/system/nix/default.nix
+    ./modules/default.nix
   ];
 
   nixpkgs = {
@@ -58,7 +58,7 @@
 
   environment.etc = {
     "makepkg.conf".source = "${pkgs.pacman}/etc/makepkg.conf";
-    "pacman.conf".source = ./modules/system/raw/pacman.conf;
+    "pacman.conf".source = ../default/raw/pacman.conf;
   };
 
   system.stateVersion = "unstable";
diff --git a/hosts/laptop/modules/system/nix/boot.nix b/hosts/laptop/modules/boot.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/boot.nix
rename to hosts/laptop/modules/boot.nix
diff --git a/hosts/laptop/modules/system/nix/default.nix b/hosts/laptop/modules/default.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/default.nix
rename to hosts/laptop/modules/default.nix
diff --git a/hosts/laptop/modules/system/nix/fingerprint.nix b/hosts/laptop/modules/fingerprint.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/fingerprint.nix
rename to hosts/laptop/modules/fingerprint.nix
diff --git a/hosts/laptop/modules/system/nix/firefox.nix b/hosts/laptop/modules/firefox.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/firefox.nix
rename to hosts/laptop/modules/firefox.nix
diff --git a/hosts/laptop/modules/system/nix/hw.nix b/hosts/laptop/modules/hw.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/hw.nix
rename to hosts/laptop/modules/hw.nix
diff --git a/hosts/laptop/modules/system/nix/networking.nix b/hosts/laptop/modules/networking.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/networking.nix
rename to hosts/laptop/modules/networking.nix
diff --git a/hosts/laptop/modules/system/nix/pkgs.nix b/hosts/laptop/modules/pkgs.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/pkgs.nix
rename to hosts/laptop/modules/pkgs.nix
diff --git a/hosts/laptop/modules/system/nix/sec.nix b/hosts/laptop/modules/sec.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/sec.nix
rename to hosts/laptop/modules/sec.nix
diff --git a/hosts/laptop/modules/system/nix/services.nix b/hosts/laptop/modules/services.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/services.nix
rename to hosts/laptop/modules/services.nix
diff --git a/hosts/laptop/modules/system/raw/pacman.conf b/hosts/laptop/modules/system/raw/pacman.conf
deleted file mode 100644
index affca54..0000000
--- a/hosts/laptop/modules/system/raw/pacman.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[options]
-HoldPkg     = pacman glibc
-Architecture = auto
-UseSyslog
-Color
-ILoveCandy
-CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-SigLevel    = Never
-LocalFileSigLevel = Optional
-
-[dkp-libs]
-Server = https://pkg.devkitpro.org/packages
-
-[dkp-linux]
-Server = https://pkg.devkitpro.org/packages/linux/$arch/
diff --git a/hosts/laptop/modules/system/nix/users.nix b/hosts/laptop/modules/users.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/users.nix
rename to hosts/laptop/modules/users.nix
diff --git a/hosts/laptop/modules/system/nix/virt.nix b/hosts/laptop/modules/virt.nix
similarity index 100%
rename from hosts/laptop/modules/system/nix/virt.nix
rename to hosts/laptop/modules/virt.nix