diff --git a/flake.nix b/flake.nix
index a360066..60e7f47 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,14 +93,14 @@
       nixosConfigurations.basado = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./os/configuration.nix
+          ./os/basado/configuration.nix
         ];
       };
 
       nixosConfigurations.moon = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./os/moon.nix
+          ./os/moon/configuration.nix
         ];
       };
 
diff --git a/os/configuration.nix b/os/basado/configuration.nix
similarity index 96%
rename from os/configuration.nix
rename to os/basado/configuration.nix
index e17782b..7c428e4 100644
--- a/os/configuration.nix
+++ b/os/basado/configuration.nix
@@ -1,14 +1,14 @@
 { config, pkgs, ... }:
-let sshKeys = with (import ../sshKeys.nix); [
+let sshKeys = with (import ../../sshKeys.nix); [
   moon
 ];
 in
 {
   imports = [
     ./hardware-configuration.nix
-    ./common.nix
-    ./common-graphics.nix
-    (import ./remote-disk-unlock.nix sshKeys)
+    ../common.nix
+    ../common-graphics.nix
+    (import ../remote-disk-unlock.nix sshKeys)
   ];
 
   boot.loader = {
diff --git a/os/hardware-configuration.nix b/os/basado/hardware-configuration.nix
similarity index 100%
rename from os/hardware-configuration.nix
rename to os/basado/hardware-configuration.nix
diff --git a/os/moon.nix b/os/moon/configuration.nix
similarity index 95%
rename from os/moon.nix
rename to os/moon/configuration.nix
index c800cb6..fd69710 100644
--- a/os/moon.nix
+++ b/os/moon/configuration.nix
@@ -1,9 +1,9 @@
 { config, pkgs, pkgs-unstable, ... }:
 {
   imports = [ # Include the results of the hardware scan.
-    ./moon-hardware-configuration.nix
-    ./common.nix
-    ./common-graphics.nix
+    ./hardware-configuration.nix
+    ../common.nix
+    ../common-graphics.nix
   ];
 
   # Bootloader.
diff --git a/os/moon-hardware-configuration.nix b/os/moon/hardware-configuration.nix
similarity index 100%
rename from os/moon-hardware-configuration.nix
rename to os/moon/hardware-configuration.nix