diff --git a/systems/aurora.nix b/systems/aurora.nix
new file mode 100644
index 0000000..1d92dd5
--- /dev/null
+++ b/systems/aurora.nix
@@ -0,0 +1,10 @@
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [
+#      /etc/nixos/hardware-configuration.nix
+      ./user-jsutter.nix
+    ];
+}
diff --git a/configuration.nix b/systems/common.nix
similarity index 72%
rename from configuration.nix
rename to systems/common.nix
index 0bc6c38..8495904 100644
--- a/configuration.nix
+++ b/systems/common.nix
@@ -1,16 +1,43 @@
-# 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, ... }:
 
 {
   imports =
     [
-      /etc/nixos/hardware-configuration.nix
-      /etc/nixos/user-jsutter.nix
+#      /etc/nixos/hardware-configuration.nix
+#      /etc/nixos/user-jsutter.nix
     ];
 
+  users.users.jsutter = {
+    isNormalUser = true;
+    description = "Julian Sutter";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      firefox
+      git
+      tor-browser-bundle-bin
+      nextcloud-client
+      vlc
+      deluge
+      steam
+      vmware-horizon-client
+      kleopatra
+      pinentry
+      arc-theme
+      zoom-us
+      slack
+      vscodium
+    ];
+  };
+
+  # Options for Steam
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  };
+
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -22,19 +49,6 @@
   # Flakes
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  # Power Stuff
-  services.power-profiles-daemon.enable = false;
-  services.tlp = {
-    enable = true;
-    settings = {
-      CPU_BOOST_ON_BAT = 0;
-      CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave";
-      START_CHARGE_THRESH_BAT0 = 90;
-      STOP_CHARGE_THRESH_BAT0 = 97;
-      RUNTIME_PM_ON_BAT = "auto";
-    };
-  };
-
   networking.networkmanager.enable = true;
 
   # Set your time zone.
@@ -82,35 +96,6 @@
     pulse.enable = true;
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.jsutter = {
-    isNormalUser = true;
-    description = "Julian Sutter";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      firefox
-      git
-      tor-browser-bundle-bin
-      nextcloud-client
-      vlc
-      deluge
-      steam
-      vmware-horizon-client
-      kleopatra
-      pinentry
-      arc-theme
-      zoom-us
-      slack
-      vscodium
-    ];
-  };
-
-  # Options for Steam
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
   programs.java.enable = true; 
 
   # Allow unfree packages
@@ -149,19 +134,8 @@ services.pcscd.enable = true;
      enableSSHSupport = true;
 };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
-  system.stateVersion = "22.11"; # Did you read the comment?
+  system.stateVersion = "23.05"; # Did you read the comment?
 
 }
diff --git a/systems/framework.nix b/systems/framework.nix
new file mode 100644
index 0000000..74883e6
--- /dev/null
+++ b/systems/framework.nix
@@ -0,0 +1,24 @@
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [
+#      /etc/nixos/hardware-configuration.nix
+      /etc/nixos/user-jsutter.nix
+    ];
+
+
+  # Power Stuff
+  services.power-profiles-daemon.enable = false;
+  services.tlp = {
+    enable = true;
+    settings = {
+      CPU_BOOST_ON_BAT = 0;
+      CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave";
+      START_CHARGE_THRESH_BAT0 = 90;
+      STOP_CHARGE_THRESH_BAT0 = 97;
+      RUNTIME_PM_ON_BAT = "auto";
+    };
+  };
+}
\ No newline at end of file