diff --git a/.gitignore b/.gitignore
index 61335e4..dbee5b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/hardware-configuration.nix
-/hardware.nix
 /result
-*.qcow2
\ No newline at end of file
+*.qcow2
diff --git a/configuration.nix b/configuration/configuration.nix
similarity index 92%
rename from configuration.nix
rename to configuration/configuration.nix
index 39a8f47..8de3fd3 100644
--- a/configuration.nix
+++ b/configuration/configuration.nix
@@ -6,7 +6,6 @@
       ./hardware-configuration.nix
       ./packages.nix
       ./system.nix
-      # ./hardware.nix # Set in the up.sh script among the files in hardware/
       ./networking.nix
       ./user/user.nix
       ./specialisation.nix
diff --git a/gaming.nix b/configuration/gaming.nix
similarity index 100%
rename from gaming.nix
rename to configuration/gaming.nix
diff --git a/networking.nix b/configuration/networking.nix
similarity index 100%
rename from networking.nix
rename to configuration/networking.nix
diff --git a/packages.nix b/configuration/packages.nix
similarity index 100%
rename from packages.nix
rename to configuration/packages.nix
diff --git a/specialisation.nix b/configuration/specialisation.nix
similarity index 100%
rename from specialisation.nix
rename to configuration/specialisation.nix
diff --git a/system.nix b/configuration/system.nix
similarity index 100%
rename from system.nix
rename to configuration/system.nix
diff --git a/user/home.nix b/configuration/user/home.nix
similarity index 100%
rename from user/home.nix
rename to configuration/user/home.nix
diff --git a/user/packages.nix b/configuration/user/packages.nix
similarity index 100%
rename from user/packages.nix
rename to configuration/user/packages.nix
diff --git a/user/user.nix b/configuration/user/user.nix
similarity index 100%
rename from user/user.nix
rename to configuration/user/user.nix
diff --git a/flake.nix b/flake.nix
index a60e778..4d4bcde 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
   };
 
   outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: {
-    nixosConfigurations.lyes-nix = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.lyes-pc = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = attrs;
       modules = [
diff --git a/up.sh b/up.sh
deleted file mode 100755
index afaf45b..0000000
--- a/up.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-rm *.qcow2 result 2> /dev/null
-
-# if [ -n "$1" ]; then
-#     echo "Changing hardware"
-#     cp hardware/"$1".nix hardware.nix
-#     exit 0
-# fi
-
-if [ "$EUID" -ne 0 ]; then
-    echo "Please run as root"
-    exit 1
-fi
-
-echo "Updating configuration"
-rm hardware-configuration.nix
-sudo cp -rf * /etc/nixos/
-cp /etc/nixos/hardware-configuration.nix .