diff --git a/apply.sh b/apply.sh
index 5f68fc1..c0241f4 100755
--- a/apply.sh
+++ b/apply.sh
@@ -2,5 +2,5 @@
 
 sudo rsync -ah --delete --progress `pwd`/ /root/nixos/
 sudo rm /etc/nixos/configuration.nix
-sudo ln -s /root/nixos/machine/`hostname`/configuration.nix /etc/nixos/configuration.nix
-sudo nixos-rebuild switch
\ No newline at end of file
+sudo ln -s /root/nixos/machine/`hostname`.nix /etc/nixos/configuration.nix
+sudo nixos-rebuild switch
diff --git a/machine/desktop/configuration.nix b/machine/desktop.nix
similarity index 97%
rename from machine/desktop/configuration.nix
rename to machine/desktop.nix
index fefc060..aa39911 100644
--- a/machine/desktop/configuration.nix
+++ b/machine/desktop.nix
@@ -7,10 +7,10 @@ in
   imports =
     [ # Include the results of the hardware scan.
       /etc/nixos/hardware-configuration.nix
-      ../../configs/gui.nix
-      ../../configs/virtualisation.nix
-      ../../configs/common.nix
-      ../../configs/user.nix
+      ../configs/gui.nix
+      ../configs/virtualisation.nix
+      ../configs/common.nix
+      ../configs/user.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/machine/homeserver/configuration.nix b/machine/homeserver.nix
similarity index 98%
rename from machine/homeserver/configuration.nix
rename to machine/homeserver.nix
index a8a5f0a..4d4be37 100644
--- a/machine/homeserver/configuration.nix
+++ b/machine/homeserver.nix
@@ -4,8 +4,8 @@
   imports =
     [ # Include the results of the hardware scan.
       /etc/nixos/hardware-configuration.nix
-      ../../configs/common.nix
-      ../../configs/virtualisation.nix
+      ../configs/common.nix
+      ../configs/virtualisation.nix
       (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
     ];
 
@@ -71,7 +71,7 @@
 
   systemd.mounts = [
     {
-      requires = [ 
+      requires = [
         "mnt-disk1.mount"
         "mnt-disk2.mount"
         "mnt-disk3.mount"
@@ -171,7 +171,7 @@
       guest account = nobody
       map to guest = bad user
       logging = systemd
-      max log size = 50      
+      max log size = 50
     '';
     shares = {
       storage = {
diff --git a/machine/thinkpad/configuration.nix b/machine/thinkpad.nix
similarity index 97%
rename from machine/thinkpad/configuration.nix
rename to machine/thinkpad.nix
index 060b442..c309227 100644
--- a/machine/thinkpad/configuration.nix
+++ b/machine/thinkpad.nix
@@ -17,10 +17,10 @@ in
     [ # Include the results of the hardware scan.
       <nixos-hardware/lenovo/thinkpad/x1-extreme>
       /etc/nixos/hardware-configuration.nix
-      ../../configs/gui.nix
-      ../../configs/virtualisation.nix
-      ../../configs/common.nix
-      ../../configs/user.nix
+      ../configs/gui.nix
+      ../configs/virtualisation.nix
+      ../configs/common.nix
+      ../configs/user.nix
     ];
 
   # boot.initrd.luks.devices = {
diff --git a/machine/vps/configuration.nix b/machine/vps.nix
similarity index 98%
rename from machine/vps/configuration.nix
rename to machine/vps.nix
index 786dfdd..9074f0c 100644
--- a/machine/vps/configuration.nix
+++ b/machine/vps.nix
@@ -4,8 +4,8 @@
   imports =
     [ # Include the results of the hardware scan.
       /etc/nixos/hardware-configuration.nix
-      ../../configs/common.nix
-      ../../configs/virtualisation.nix
+      ../configs/common.nix
+      ../configs/virtualisation.nix
       (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
     ];