diff --git a/laptops/channels.scm b/channels.scm
similarity index 100%
rename from laptops/channels.scm
rename to channels.scm
diff --git a/servers/excellon/caddy/Caddyfile b/excellon/caddy/Caddyfile
similarity index 100%
rename from servers/excellon/caddy/Caddyfile
rename to excellon/caddy/Caddyfile
diff --git a/servers/excellon/caddy/Dockerfile b/excellon/caddy/Dockerfile
similarity index 100%
rename from servers/excellon/caddy/Dockerfile
rename to excellon/caddy/Dockerfile
diff --git a/servers/excellon/config.scm b/excellon/config.scm
similarity index 100%
rename from servers/excellon/config.scm
rename to excellon/config.scm
diff --git a/servers/docs_luks_notes.txt b/servers/docs_luks_notes.txt
deleted file mode 100644
index 0db1289..0000000
--- a/servers/docs_luks_notes.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-# cryptsetup -v -c aes-xts-plain64 -h sha512 -s 512 luksFormat /dev/sdc /etc/cryptkey
-# cryptsetup -v -c aes-xts-plain64 -h sha512 -s 512 luksFormat /dev/sde /etc/cryptkey
-
-cryptsetup -v -c aes-xts-plain64 -h sha512 -s 512 luksFormat /dev/sdc -
-cryptsetup -v -c aes-xts-plain64 -h sha512 -s 512 luksFormat /dev/sde -
-
-cryptsetup luksHeaderBackup --header-backup-file ~/sde.header.bak /dev/sde
-cryptsetup luksHeaderBackup --header-backup-file ~/sdc.header.bak /dev/sdc
-
-/etc/crypttab
-doc1 UUID=dcfc1a1e-7920-43e4-a55a-e841fb23a389 /etc/cryptkey luks,noearly #,discard (for SSDs)
-doc2 UUID=8445e3f9-4c73-4726-966b-1b8ec8fa9675 /etc/cryptkey luks,noearly #,discard (for SSDs)
-
-/dev/sde: UUID="cf6bafca-b225-46ca-8dfc-b82fb6ab5560" TYPE="crypto_LUKS"
-/dev/sdc: UUID="05f833fb-1c68-4453-9df5-68a454f59845" TYPE="crypto_LUKS"
-
-# cryptsetup open --key-file=/etc/cryptkey --type luks /dev/sde doc1
-# cryptsetup open --key-file=/etc/cryptkey --type luks /dev/sdc doc2
-
-cryptsetup open --type luks /dev/sde doc1
-cryptsetup open --type luks /dev/sdc doc2
-
-
-mkfs.btrfs -f -L docs -m raid1 -d raid1 /dev/mapper/doc1 /dev/mapper/doc2
-
-Label:              docs
-UUID:               2ae0eae2-bc13-4dbc-baa7-6e902847e0a6
-Node size:          16384
-Sector size:        4096
-Filesystem size:    1.82TiB
-Block group profiles:
-  Data:             RAID1             1.00GiB
-  Metadata:         RAID1             1.00GiB
-  System:           RAID1             8.00MiB
-SSD detected:       no
-Zoned device:       no
-Incompat features:  extref, skinny-metadata, no-holes, free-space-tree
-Runtime features:   free-space-tree
-Checksum:           crc32c
-Number of devices:  2
-Devices:
-   ID        SIZE  PATH
-    1   931.51GiB  /dev/mapper/doc1
-    2   931.51GiB  /dev/mapper/doc2
-
-
-
-mount -t btrfs -o defaults,noatime,compress=zstd -L docs /docs
-
-
-sudo blkid /dev/mapper/doc1
-/dev/mapper/doc1: LABEL="docs" UUID="cd4efb2f-a791-41de-8f19-65baf747c57c" UUID_SUB="c0356a61-57e8-4f1e-b9cb-7ca16c5e8c0b" BLOCK_SIZE="4096" TYPE="btrfs"
-
-
-/dev/mapper/doc1: LABEL="docs" UUID="cd4efb2f-a791-41de-8f19-65baf747c57c" UUID_SUB="c0356a61-57e8-4f1e-b9cb-7ca16c5e8c0b" BLOCK_SIZE="4096" TYPE="btrfs"
-
-/dev/mapper/doc2: LABEL="docs" UUID="cd4efb2f-a791-41de-8f19-65baf747c57c" UUID_SUB="d3266122-df77-49e6-be86-4bb6226e96df" BLOCK_SIZE="4096" TYPE="btrfs"
diff --git a/laptops/x1carbon/system.scm b/x1carbon/system.scm
similarity index 100%
rename from laptops/x1carbon/system.scm
rename to x1carbon/system.scm
diff --git a/laptops/xps9360/system.scm b/xps9360/system.scm
similarity index 100%
rename from laptops/xps9360/system.scm
rename to xps9360/system.scm