diff --git a/.gitignore b/nixos/hardware/.gitignore
similarity index 100%
rename from .gitignore
rename to nixos/hardware/.gitignore
diff --git a/.travis.yml b/nixos/hardware/.travis.yml
similarity index 100%
rename from .travis.yml
rename to nixos/hardware/.travis.yml
diff --git a/CODEOWNERS b/nixos/hardware/CODEOWNERS
similarity index 100%
rename from CODEOWNERS
rename to nixos/hardware/CODEOWNERS
diff --git a/CONTRIBUTING.md b/nixos/hardware/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to nixos/hardware/CONTRIBUTING.md
diff --git a/COPYING b/nixos/hardware/COPYING
similarity index 100%
rename from COPYING
rename to nixos/hardware/COPYING
diff --git a/README.md b/nixos/hardware/README.md
similarity index 100%
rename from README.md
rename to nixos/hardware/README.md
diff --git a/acer/aspire/4810t/README.wiki b/nixos/hardware/acer/aspire/4810t/README.wiki
similarity index 100%
rename from acer/aspire/4810t/README.wiki
rename to nixos/hardware/acer/aspire/4810t/README.wiki
diff --git a/acer/aspire/4810t/default.nix b/nixos/hardware/acer/aspire/4810t/default.nix
similarity index 100%
rename from acer/aspire/4810t/default.nix
rename to nixos/hardware/acer/aspire/4810t/default.nix
diff --git a/airis/n990/default.nix b/nixos/hardware/airis/n990/default.nix
similarity index 100%
rename from airis/n990/default.nix
rename to nixos/hardware/airis/n990/default.nix
diff --git a/apple/default.nix b/nixos/hardware/apple/default.nix
similarity index 100%
rename from apple/default.nix
rename to nixos/hardware/apple/default.nix
diff --git a/apple/macbook-air/3/default.nix b/nixos/hardware/apple/macbook-air/3/default.nix
similarity index 100%
rename from apple/macbook-air/3/default.nix
rename to nixos/hardware/apple/macbook-air/3/default.nix
diff --git a/apple/macbook-air/4/default.nix b/nixos/hardware/apple/macbook-air/4/default.nix
similarity index 100%
rename from apple/macbook-air/4/default.nix
rename to nixos/hardware/apple/macbook-air/4/default.nix
diff --git a/apple/macbook-air/6/default.nix b/nixos/hardware/apple/macbook-air/6/default.nix
similarity index 100%
rename from apple/macbook-air/6/default.nix
rename to nixos/hardware/apple/macbook-air/6/default.nix
diff --git a/apple/macbook-air/default.nix b/nixos/hardware/apple/macbook-air/default.nix
similarity index 100%
rename from apple/macbook-air/default.nix
rename to nixos/hardware/apple/macbook-air/default.nix
diff --git a/apple/macbook-pro/10-1/README.wiki b/nixos/hardware/apple/macbook-pro/10-1/README.wiki
similarity index 100%
rename from apple/macbook-pro/10-1/README.wiki
rename to nixos/hardware/apple/macbook-pro/10-1/README.wiki
diff --git a/apple/macbook-pro/10-1/default.nix b/nixos/hardware/apple/macbook-pro/10-1/default.nix
similarity index 100%
rename from apple/macbook-pro/10-1/default.nix
rename to nixos/hardware/apple/macbook-pro/10-1/default.nix
diff --git a/apple/macbook-pro/11-5/README.md b/nixos/hardware/apple/macbook-pro/11-5/README.md
similarity index 100%
rename from apple/macbook-pro/11-5/README.md
rename to nixos/hardware/apple/macbook-pro/11-5/README.md
diff --git a/apple/macbook-pro/11-5/default.nix b/nixos/hardware/apple/macbook-pro/11-5/default.nix
similarity index 100%
rename from apple/macbook-pro/11-5/default.nix
rename to nixos/hardware/apple/macbook-pro/11-5/default.nix
diff --git a/apple/macbook-pro/12-1/default.nix b/nixos/hardware/apple/macbook-pro/12-1/default.nix
similarity index 100%
rename from apple/macbook-pro/12-1/default.nix
rename to nixos/hardware/apple/macbook-pro/12-1/default.nix
diff --git a/apple/macbook-pro/default.nix b/nixos/hardware/apple/macbook-pro/default.nix
similarity index 100%
rename from apple/macbook-pro/default.nix
rename to nixos/hardware/apple/macbook-pro/default.nix
diff --git a/asus/wireless-ac1300.nix b/nixos/hardware/asus/wireless-ac1300.nix
similarity index 100%
rename from asus/wireless-ac1300.nix
rename to nixos/hardware/asus/wireless-ac1300.nix
diff --git a/audio-gd/compass2.nix b/nixos/hardware/audio-gd/compass2.nix
similarity index 100%
rename from audio-gd/compass2.nix
rename to nixos/hardware/audio-gd/compass2.nix
diff --git a/beagleboard/pocketbeagle/default.nix b/nixos/hardware/beagleboard/pocketbeagle/default.nix
similarity index 100%
rename from beagleboard/pocketbeagle/default.nix
rename to nixos/hardware/beagleboard/pocketbeagle/default.nix
diff --git a/common/cpu/amd/default.nix b/nixos/hardware/common/cpu/amd/default.nix
similarity index 100%
rename from common/cpu/amd/default.nix
rename to nixos/hardware/common/cpu/amd/default.nix
diff --git a/common/cpu/intel/default.nix b/nixos/hardware/common/cpu/intel/default.nix
similarity index 100%
rename from common/cpu/intel/default.nix
rename to nixos/hardware/common/cpu/intel/default.nix
diff --git a/common/cpu/intel/kaby-lake/default.nix b/nixos/hardware/common/cpu/intel/kaby-lake/default.nix
similarity index 100%
rename from common/cpu/intel/kaby-lake/default.nix
rename to nixos/hardware/common/cpu/intel/kaby-lake/default.nix
diff --git a/common/cpu/intel/sandy-bridge/default.nix b/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix
similarity index 100%
rename from common/cpu/intel/sandy-bridge/default.nix
rename to nixos/hardware/common/cpu/intel/sandy-bridge/default.nix
diff --git a/common/pc/default.nix b/nixos/hardware/common/pc/default.nix
similarity index 100%
rename from common/pc/default.nix
rename to nixos/hardware/common/pc/default.nix
diff --git a/common/pc/hdd/default.nix b/nixos/hardware/common/pc/hdd/default.nix
similarity index 100%
rename from common/pc/hdd/default.nix
rename to nixos/hardware/common/pc/hdd/default.nix
diff --git a/common/pc/laptop/acpi_call.nix b/nixos/hardware/common/pc/laptop/acpi_call.nix
similarity index 100%
rename from common/pc/laptop/acpi_call.nix
rename to nixos/hardware/common/pc/laptop/acpi_call.nix
diff --git a/common/pc/laptop/default.nix b/nixos/hardware/common/pc/laptop/default.nix
similarity index 100%
rename from common/pc/laptop/default.nix
rename to nixos/hardware/common/pc/laptop/default.nix
diff --git a/common/pc/laptop/hdd/default.nix b/nixos/hardware/common/pc/laptop/hdd/default.nix
similarity index 100%
rename from common/pc/laptop/hdd/default.nix
rename to nixos/hardware/common/pc/laptop/hdd/default.nix
diff --git a/common/pc/laptop/ssd b/nixos/hardware/common/pc/laptop/ssd
similarity index 100%
rename from common/pc/laptop/ssd
rename to nixos/hardware/common/pc/laptop/ssd
diff --git a/common/pc/ssd/default.nix b/nixos/hardware/common/pc/ssd/default.nix
similarity index 100%
rename from common/pc/ssd/default.nix
rename to nixos/hardware/common/pc/ssd/default.nix
diff --git a/default.nix b/nixos/hardware/default.nix
similarity index 100%
rename from default.nix
rename to nixos/hardware/default.nix
diff --git a/dell/e7240/README.md b/nixos/hardware/dell/e7240/README.md
similarity index 100%
rename from dell/e7240/README.md
rename to nixos/hardware/dell/e7240/README.md
diff --git a/dell/e7240/default.nix b/nixos/hardware/dell/e7240/default.nix
similarity index 100%
rename from dell/e7240/default.nix
rename to nixos/hardware/dell/e7240/default.nix
diff --git a/dell/latitude/3480/default.nix b/nixos/hardware/dell/latitude/3480/default.nix
similarity index 100%
rename from dell/latitude/3480/default.nix
rename to nixos/hardware/dell/latitude/3480/default.nix
diff --git a/dell/xps/13-7390/README.wiki b/nixos/hardware/dell/xps/13-7390/README.wiki
similarity index 100%
rename from dell/xps/13-7390/README.wiki
rename to nixos/hardware/dell/xps/13-7390/README.wiki
diff --git a/dell/xps/13-7390/default.nix b/nixos/hardware/dell/xps/13-7390/default.nix
similarity index 100%
rename from dell/xps/13-7390/default.nix
rename to nixos/hardware/dell/xps/13-7390/default.nix
diff --git a/dell/xps/13-9360/default.nix b/nixos/hardware/dell/xps/13-9360/default.nix
similarity index 100%
rename from dell/xps/13-9360/default.nix
rename to nixos/hardware/dell/xps/13-9360/default.nix
diff --git a/dell/xps/13-9360/qca6174-firmware.nix b/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix
similarity index 100%
rename from dell/xps/13-9360/qca6174-firmware.nix
rename to nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix
diff --git a/dell/xps/13-9370/README.wiki b/nixos/hardware/dell/xps/13-9370/README.wiki
similarity index 100%
rename from dell/xps/13-9370/README.wiki
rename to nixos/hardware/dell/xps/13-9370/README.wiki
diff --git a/dell/xps/13-9370/default.nix b/nixos/hardware/dell/xps/13-9370/default.nix
similarity index 100%
rename from dell/xps/13-9370/default.nix
rename to nixos/hardware/dell/xps/13-9370/default.nix
diff --git a/dell/xps/13-9380/README.wiki b/nixos/hardware/dell/xps/13-9380/README.wiki
similarity index 100%
rename from dell/xps/13-9380/README.wiki
rename to nixos/hardware/dell/xps/13-9380/README.wiki
diff --git a/dell/xps/13-9380/default.nix b/nixos/hardware/dell/xps/13-9380/default.nix
similarity index 100%
rename from dell/xps/13-9380/default.nix
rename to nixos/hardware/dell/xps/13-9380/default.nix
diff --git a/dell/xps/15-7590/README.wiki b/nixos/hardware/dell/xps/15-7590/README.wiki
similarity index 100%
rename from dell/xps/15-7590/README.wiki
rename to nixos/hardware/dell/xps/15-7590/README.wiki
diff --git a/dell/xps/15-7590/default.nix b/nixos/hardware/dell/xps/15-7590/default.nix
similarity index 100%
rename from dell/xps/15-7590/default.nix
rename to nixos/hardware/dell/xps/15-7590/default.nix
diff --git a/dell/xps/15-9550/README.wiki b/nixos/hardware/dell/xps/15-9550/README.wiki
similarity index 100%
rename from dell/xps/15-9550/README.wiki
rename to nixos/hardware/dell/xps/15-9550/README.wiki
diff --git a/dell/xps/15-9550/default.nix b/nixos/hardware/dell/xps/15-9550/default.nix
similarity index 100%
rename from dell/xps/15-9550/default.nix
rename to nixos/hardware/dell/xps/15-9550/default.nix
diff --git a/dell/xps/15-9560/README.wiki b/nixos/hardware/dell/xps/15-9560/README.wiki
similarity index 100%
rename from dell/xps/15-9560/README.wiki
rename to nixos/hardware/dell/xps/15-9560/README.wiki
diff --git a/dell/xps/15-9560/default.nix b/nixos/hardware/dell/xps/15-9560/default.nix
similarity index 100%
rename from dell/xps/15-9560/default.nix
rename to nixos/hardware/dell/xps/15-9560/default.nix
diff --git a/dell/xps/15-9560/intel/default.nix b/nixos/hardware/dell/xps/15-9560/intel/default.nix
similarity index 100%
rename from dell/xps/15-9560/intel/default.nix
rename to nixos/hardware/dell/xps/15-9560/intel/default.nix
diff --git a/dell/xps/15-9560/nvidia/default.nix b/nixos/hardware/dell/xps/15-9560/nvidia/default.nix
similarity index 100%
rename from dell/xps/15-9560/nvidia/default.nix
rename to nixos/hardware/dell/xps/15-9560/nvidia/default.nix
diff --git a/dell/xps/15-9560/xps-common.nix b/nixos/hardware/dell/xps/15-9560/xps-common.nix
similarity index 100%
rename from dell/xps/15-9560/xps-common.nix
rename to nixos/hardware/dell/xps/15-9560/xps-common.nix
diff --git a/google/pixelbook/default.nix b/nixos/hardware/google/pixelbook/default.nix
similarity index 100%
rename from google/pixelbook/default.nix
rename to nixos/hardware/google/pixelbook/default.nix
diff --git a/inversepath/usbarmory/README.txt b/nixos/hardware/inversepath/usbarmory/README.txt
similarity index 100%
rename from inversepath/usbarmory/README.txt
rename to nixos/hardware/inversepath/usbarmory/README.txt
diff --git a/inversepath/usbarmory/default.nix b/nixos/hardware/inversepath/usbarmory/default.nix
similarity index 100%
rename from inversepath/usbarmory/default.nix
rename to nixos/hardware/inversepath/usbarmory/default.nix
diff --git a/inversepath/usbarmory/host.nix b/nixos/hardware/inversepath/usbarmory/host.nix
similarity index 100%
rename from inversepath/usbarmory/host.nix
rename to nixos/hardware/inversepath/usbarmory/host.nix
diff --git a/inversepath/usbarmory/kernel.config b/nixos/hardware/inversepath/usbarmory/kernel.config
similarity index 100%
rename from inversepath/usbarmory/kernel.config
rename to nixos/hardware/inversepath/usbarmory/kernel.config
diff --git a/inversepath/usbarmory/kernel.nix b/nixos/hardware/inversepath/usbarmory/kernel.nix
similarity index 100%
rename from inversepath/usbarmory/kernel.nix
rename to nixos/hardware/inversepath/usbarmory/kernel.nix
diff --git a/inversepath/usbarmory/usbarmory-dts.patch b/nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch
similarity index 100%
rename from inversepath/usbarmory/usbarmory-dts.patch
rename to nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch
diff --git a/lenovo/ideapad/default.nix b/nixos/hardware/lenovo/ideapad/default.nix
similarity index 100%
rename from lenovo/ideapad/default.nix
rename to nixos/hardware/lenovo/ideapad/default.nix
diff --git a/lenovo/ideapad/z510/default.nix b/nixos/hardware/lenovo/ideapad/z510/default.nix
similarity index 100%
rename from lenovo/ideapad/z510/default.nix
rename to nixos/hardware/lenovo/ideapad/z510/default.nix
diff --git a/lenovo/thinkpad/default.nix b/nixos/hardware/lenovo/thinkpad/default.nix
similarity index 100%
rename from lenovo/thinkpad/default.nix
rename to nixos/hardware/lenovo/thinkpad/default.nix
diff --git a/lenovo/thinkpad/e495/default.nix b/nixos/hardware/lenovo/thinkpad/e495/default.nix
similarity index 100%
rename from lenovo/thinkpad/e495/default.nix
rename to nixos/hardware/lenovo/thinkpad/e495/default.nix
diff --git a/lenovo/thinkpad/l13/default.nix b/nixos/hardware/lenovo/thinkpad/l13/default.nix
similarity index 100%
rename from lenovo/thinkpad/l13/default.nix
rename to nixos/hardware/lenovo/thinkpad/l13/default.nix
diff --git a/lenovo/thinkpad/p53/default.nix b/nixos/hardware/lenovo/thinkpad/p53/default.nix
similarity index 100%
rename from lenovo/thinkpad/p53/default.nix
rename to nixos/hardware/lenovo/thinkpad/p53/default.nix
diff --git a/lenovo/thinkpad/t410/default.nix b/nixos/hardware/lenovo/thinkpad/t410/default.nix
similarity index 100%
rename from lenovo/thinkpad/t410/default.nix
rename to nixos/hardware/lenovo/thinkpad/t410/default.nix
diff --git a/lenovo/thinkpad/t420/default.nix b/nixos/hardware/lenovo/thinkpad/t420/default.nix
similarity index 100%
rename from lenovo/thinkpad/t420/default.nix
rename to nixos/hardware/lenovo/thinkpad/t420/default.nix
diff --git a/lenovo/thinkpad/t430/default.nix b/nixos/hardware/lenovo/thinkpad/t430/default.nix
similarity index 100%
rename from lenovo/thinkpad/t430/default.nix
rename to nixos/hardware/lenovo/thinkpad/t430/default.nix
diff --git a/lenovo/thinkpad/t440p/default.nix b/nixos/hardware/lenovo/thinkpad/t440p/default.nix
similarity index 100%
rename from lenovo/thinkpad/t440p/default.nix
rename to nixos/hardware/lenovo/thinkpad/t440p/default.nix
diff --git a/lenovo/thinkpad/t440s/default.nix b/nixos/hardware/lenovo/thinkpad/t440s/default.nix
similarity index 100%
rename from lenovo/thinkpad/t440s/default.nix
rename to nixos/hardware/lenovo/thinkpad/t440s/default.nix
diff --git a/lenovo/thinkpad/t450s/default.nix b/nixos/hardware/lenovo/thinkpad/t450s/default.nix
similarity index 100%
rename from lenovo/thinkpad/t450s/default.nix
rename to nixos/hardware/lenovo/thinkpad/t450s/default.nix
diff --git a/lenovo/thinkpad/t460s/default.nix b/nixos/hardware/lenovo/thinkpad/t460s/default.nix
similarity index 100%
rename from lenovo/thinkpad/t460s/default.nix
rename to nixos/hardware/lenovo/thinkpad/t460s/default.nix
diff --git a/lenovo/thinkpad/t470s/default.nix b/nixos/hardware/lenovo/thinkpad/t470s/default.nix
similarity index 100%
rename from lenovo/thinkpad/t470s/default.nix
rename to nixos/hardware/lenovo/thinkpad/t470s/default.nix
diff --git a/lenovo/thinkpad/t480s/default.nix b/nixos/hardware/lenovo/thinkpad/t480s/default.nix
similarity index 100%
rename from lenovo/thinkpad/t480s/default.nix
rename to nixos/hardware/lenovo/thinkpad/t480s/default.nix
diff --git a/lenovo/thinkpad/t490/default.nix b/nixos/hardware/lenovo/thinkpad/t490/default.nix
similarity index 100%
rename from lenovo/thinkpad/t490/default.nix
rename to nixos/hardware/lenovo/thinkpad/t490/default.nix
diff --git a/lenovo/thinkpad/t490/t490-profile-set.conf b/nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf
similarity index 100%
rename from lenovo/thinkpad/t490/t490-profile-set.conf
rename to nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf
diff --git a/lenovo/thinkpad/t495/default.nix b/nixos/hardware/lenovo/thinkpad/t495/default.nix
similarity index 100%
rename from lenovo/thinkpad/t495/default.nix
rename to nixos/hardware/lenovo/thinkpad/t495/default.nix
diff --git a/lenovo/thinkpad/tp-smapi.nix b/nixos/hardware/lenovo/thinkpad/tp-smapi.nix
similarity index 100%
rename from lenovo/thinkpad/tp-smapi.nix
rename to nixos/hardware/lenovo/thinkpad/tp-smapi.nix
diff --git a/lenovo/thinkpad/x1-extreme/default.nix b/nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix
similarity index 100%
rename from lenovo/thinkpad/x1-extreme/default.nix
rename to nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix
diff --git a/lenovo/thinkpad/x1-extreme/gen2/default.nix b/nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix
similarity index 100%
rename from lenovo/thinkpad/x1-extreme/gen2/default.nix
rename to nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix
diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
similarity index 100%
rename from lenovo/thinkpad/x1/6th-gen/QHD/default.nix
rename to nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix
similarity index 100%
rename from lenovo/thinkpad/x1/6th-gen/default.nix
rename to nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix
diff --git a/lenovo/thinkpad/x1/7th-gen/audio.nix b/nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix
similarity index 100%
rename from lenovo/thinkpad/x1/7th-gen/audio.nix
rename to nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix
diff --git a/lenovo/thinkpad/x1/7th-gen/default.nix b/nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix
similarity index 100%
rename from lenovo/thinkpad/x1/7th-gen/default.nix
rename to nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix
diff --git a/lenovo/thinkpad/x1/default.nix b/nixos/hardware/lenovo/thinkpad/x1/default.nix
similarity index 100%
rename from lenovo/thinkpad/x1/default.nix
rename to nixos/hardware/lenovo/thinkpad/x1/default.nix
diff --git a/lenovo/thinkpad/x140e/default.nix b/nixos/hardware/lenovo/thinkpad/x140e/default.nix
similarity index 100%
rename from lenovo/thinkpad/x140e/default.nix
rename to nixos/hardware/lenovo/thinkpad/x140e/default.nix
diff --git a/lenovo/thinkpad/x220/default.nix b/nixos/hardware/lenovo/thinkpad/x220/default.nix
similarity index 100%
rename from lenovo/thinkpad/x220/default.nix
rename to nixos/hardware/lenovo/thinkpad/x220/default.nix
diff --git a/lenovo/thinkpad/x230/default.nix b/nixos/hardware/lenovo/thinkpad/x230/default.nix
similarity index 100%
rename from lenovo/thinkpad/x230/default.nix
rename to nixos/hardware/lenovo/thinkpad/x230/default.nix
diff --git a/lenovo/thinkpad/x250/default.nix b/nixos/hardware/lenovo/thinkpad/x250/default.nix
similarity index 100%
rename from lenovo/thinkpad/x250/default.nix
rename to nixos/hardware/lenovo/thinkpad/x250/default.nix
diff --git a/lenovo/thinkpad/x260/default.nix b/nixos/hardware/lenovo/thinkpad/x260/default.nix
similarity index 100%
rename from lenovo/thinkpad/x260/default.nix
rename to nixos/hardware/lenovo/thinkpad/x260/default.nix
diff --git a/lenovo/thinkpad/x270/default.nix b/nixos/hardware/lenovo/thinkpad/x270/default.nix
similarity index 100%
rename from lenovo/thinkpad/x270/default.nix
rename to nixos/hardware/lenovo/thinkpad/x270/default.nix
diff --git a/lenovo/thinkpad/x280/default.nix b/nixos/hardware/lenovo/thinkpad/x280/default.nix
similarity index 100%
rename from lenovo/thinkpad/x280/default.nix
rename to nixos/hardware/lenovo/thinkpad/x280/default.nix
diff --git a/microsoft/hyper-v/README.md b/nixos/hardware/microsoft/hyper-v/README.md
similarity index 100%
rename from microsoft/hyper-v/README.md
rename to nixos/hardware/microsoft/hyper-v/README.md
diff --git a/microsoft/surface-pro/3/README.wiki b/nixos/hardware/microsoft/surface-pro/3/README.wiki
similarity index 100%
rename from microsoft/surface-pro/3/README.wiki
rename to nixos/hardware/microsoft/surface-pro/3/README.wiki
diff --git a/microsoft/surface-pro/3/default.nix b/nixos/hardware/microsoft/surface-pro/3/default.nix
similarity index 100%
rename from microsoft/surface-pro/3/default.nix
rename to nixos/hardware/microsoft/surface-pro/3/default.nix
diff --git a/pcengines/apu/default.nix b/nixos/hardware/pcengines/apu/default.nix
similarity index 100%
rename from pcengines/apu/default.nix
rename to nixos/hardware/pcengines/apu/default.nix
diff --git a/purism/librem/13v3/README.md b/nixos/hardware/purism/librem/13v3/README.md
similarity index 100%
rename from purism/librem/13v3/README.md
rename to nixos/hardware/purism/librem/13v3/README.md
diff --git a/purism/librem/13v3/default.nix b/nixos/hardware/purism/librem/13v3/default.nix
similarity index 100%
rename from purism/librem/13v3/default.nix
rename to nixos/hardware/purism/librem/13v3/default.nix
diff --git a/purism/librem/15v3 b/nixos/hardware/purism/librem/15v3
similarity index 100%
rename from purism/librem/15v3
rename to nixos/hardware/purism/librem/15v3
diff --git a/raspberry-pi/2/README.org b/nixos/hardware/raspberry-pi/2/README.org
similarity index 100%
rename from raspberry-pi/2/README.org
rename to nixos/hardware/raspberry-pi/2/README.org
diff --git a/raspberry-pi/2/default.nix b/nixos/hardware/raspberry-pi/2/default.nix
similarity index 100%
rename from raspberry-pi/2/default.nix
rename to nixos/hardware/raspberry-pi/2/default.nix
diff --git a/samsung/np900x3c/README.wiki b/nixos/hardware/samsung/np900x3c/README.wiki
similarity index 100%
rename from samsung/np900x3c/README.wiki
rename to nixos/hardware/samsung/np900x3c/README.wiki
diff --git a/samsung/np900x3c/default.nix b/nixos/hardware/samsung/np900x3c/default.nix
similarity index 100%
rename from samsung/np900x3c/default.nix
rename to nixos/hardware/samsung/np900x3c/default.nix
diff --git a/supermicro/a1sri-2758f/default.nix b/nixos/hardware/supermicro/a1sri-2758f/default.nix
similarity index 100%
rename from supermicro/a1sri-2758f/default.nix
rename to nixos/hardware/supermicro/a1sri-2758f/default.nix
diff --git a/supermicro/x10sll-f/default.nix b/nixos/hardware/supermicro/x10sll-f/default.nix
similarity index 100%
rename from supermicro/x10sll-f/default.nix
rename to nixos/hardware/supermicro/x10sll-f/default.nix
diff --git a/tests/build-profile.nix b/nixos/hardware/tests/build-profile.nix
similarity index 100%
rename from tests/build-profile.nix
rename to nixos/hardware/tests/build-profile.nix
diff --git a/tests/run.py b/nixos/hardware/tests/run.py
similarity index 100%
rename from tests/run.py
rename to nixos/hardware/tests/run.py
diff --git a/toshiba/swanky/README.md b/nixos/hardware/toshiba/swanky/README.md
similarity index 100%
rename from toshiba/swanky/README.md
rename to nixos/hardware/toshiba/swanky/README.md
diff --git a/toshiba/swanky/default.nix b/nixos/hardware/toshiba/swanky/default.nix
similarity index 100%
rename from toshiba/swanky/default.nix
rename to nixos/hardware/toshiba/swanky/default.nix
diff --git a/tuxedo/infinitybook/v4/default.nix b/nixos/hardware/tuxedo/infinitybook/v4/default.nix
similarity index 100%
rename from tuxedo/infinitybook/v4/default.nix
rename to nixos/hardware/tuxedo/infinitybook/v4/default.nix