diff --git a/system/modules/device/default.nix b/system/modules/device/default.nix
new file mode 100644
index 0000000..d44e963
--- /dev/null
+++ b/system/modules/device/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./function
+    ./type
+    ./hardware
+  ];
+}
diff --git a/system/modules/device/function/default.nix b/system/modules/device/function/default.nix
new file mode 100644
index 0000000..9ada76b
--- /dev/null
+++ b/system/modules/device/function/default.nix
@@ -0,0 +1,13 @@
+{ lib, ... }:
+
+let
+  inherit (lib) types mkOption;
+in
+
+{
+  options.systemModules.device.function = mkOption {
+    type = with types; listOf (enum ["workstation" "media server" "gaming"]);
+    default = [];
+    description = "Primary function/s of the device";
+  };
+}
diff --git a/system/modules/hardware/cpu/amd/default.nix b/system/modules/device/hardware/cpu/amd/default.nix
similarity index 100%
rename from system/modules/hardware/cpu/amd/default.nix
rename to system/modules/device/hardware/cpu/amd/default.nix
diff --git a/system/modules/hardware/cpu/default.nix b/system/modules/device/hardware/cpu/default.nix
similarity index 100%
rename from system/modules/hardware/cpu/default.nix
rename to system/modules/device/hardware/cpu/default.nix
diff --git a/system/modules/hardware/cpu/intel/default.nix b/system/modules/device/hardware/cpu/intel/default.nix
similarity index 100%
rename from system/modules/hardware/cpu/intel/default.nix
rename to system/modules/device/hardware/cpu/intel/default.nix
diff --git a/system/modules/hardware/default.nix b/system/modules/device/hardware/default.nix
similarity index 100%
rename from system/modules/hardware/default.nix
rename to system/modules/device/hardware/default.nix
diff --git a/system/modules/hardware/features/backlight/default.nix b/system/modules/device/hardware/features/backlight/default.nix
similarity index 100%
rename from system/modules/hardware/features/backlight/default.nix
rename to system/modules/device/hardware/features/backlight/default.nix
diff --git a/system/modules/hardware/features/battery/default.nix b/system/modules/device/hardware/features/battery/default.nix
similarity index 100%
rename from system/modules/hardware/features/battery/default.nix
rename to system/modules/device/hardware/features/battery/default.nix
diff --git a/system/modules/hardware/features/bluetooth/default.nix b/system/modules/device/hardware/features/bluetooth/default.nix
similarity index 100%
rename from system/modules/hardware/features/bluetooth/default.nix
rename to system/modules/device/hardware/features/bluetooth/default.nix
diff --git a/system/modules/hardware/features/default.nix b/system/modules/device/hardware/features/default.nix
similarity index 100%
rename from system/modules/hardware/features/default.nix
rename to system/modules/device/hardware/features/default.nix
diff --git a/system/modules/hardware/gpu/amd/default.nix b/system/modules/device/hardware/gpu/amd/default.nix
similarity index 100%
rename from system/modules/hardware/gpu/amd/default.nix
rename to system/modules/device/hardware/gpu/amd/default.nix
diff --git a/system/modules/hardware/gpu/default.nix b/system/modules/device/hardware/gpu/default.nix
similarity index 100%
rename from system/modules/hardware/gpu/default.nix
rename to system/modules/device/hardware/gpu/default.nix
diff --git a/system/modules/hardware/gpu/intel/default.nix b/system/modules/device/hardware/gpu/intel/default.nix
similarity index 100%
rename from system/modules/hardware/gpu/intel/default.nix
rename to system/modules/device/hardware/gpu/intel/default.nix
diff --git a/system/modules/hardware/gpu/nvidia/default.nix b/system/modules/device/hardware/gpu/nvidia/default.nix
similarity index 100%
rename from system/modules/hardware/gpu/nvidia/default.nix
rename to system/modules/device/hardware/gpu/nvidia/default.nix
diff --git a/system/modules/hardware/ssd/default.nix b/system/modules/device/hardware/ssd/default.nix
similarity index 100%
rename from system/modules/hardware/ssd/default.nix
rename to system/modules/device/hardware/ssd/default.nix
diff --git a/system/modules/meta/device/default.nix b/system/modules/device/type/default.nix
similarity index 52%
rename from system/modules/meta/device/default.nix
rename to system/modules/device/type/default.nix
index 5e1a671..8b0f0ef 100644
--- a/system/modules/meta/device/default.nix
+++ b/system/modules/device/type/default.nix
@@ -5,9 +5,10 @@ let
 in
 
 {
-  options.systemModules.meta.device.type = mkOption {
+  options.systemModules.device.type = mkOption {
     type = types.enum ["desktop" "server" "phone" "vm"];
     default = "desktop";
-    description = "Meta option to describe what type of device the host is";
+    description = "Define what type of device the host is";
   };
 }
+
diff --git a/system/modules/meta/default.nix b/system/modules/meta/default.nix
deleted file mode 100644
index 80f25ea..0000000
--- a/system/modules/meta/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./device
-  ];
-}