diff --git a/README.md b/README.md
index d295b47..e536605 100644
--- a/README.md
+++ b/README.md
@@ -172,6 +172,13 @@ For how to configure the services, check the sections below.
 
 ## Building Blocks
 
+These building blocks are the reason selfhostblocks exist. You can pick and choose what building
+blocks you need to self host a service of your choosing. Some services are already provided out of
+the box by selfhostblocks but you might not want to use those if for example you want to integrate
+with existing services or slowly transition to NixOS.
+
+
+
 ## Demos
 
 Demos that start and deploy on a Virtual Machine on your computer are located under the
diff --git a/flake.nix b/flake.nix
index 1593c8b..c428fb0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,23 +15,24 @@
       {
         nixosModules.default = { config, ... }: {
           imports = [
-            modules/arr.nix
-            modules/authelia.nix
-            modules/backup.nix
-            modules/deluge.nix
-            modules/davfs.nix
-            modules/hledger.nix
-            modules/home-assistant.nix
-            modules/jellyfin.nix
-            modules/ldap.nix
-            modules/monitoring.nix
-            modules/nextcloud-server.nix
-            modules/nginx.nix
-            modules/postgresql.nix
-            modules/ssl.nix
-            modules/tinyproxy.nix
-            modules/vaultwarden.nix
-            modules/vpn.nix
+            modules/blocks/authelia.nix
+            modules/blocks/backup.nix
+            modules/blocks/davfs.nix
+            modules/blocks/ldap.nix
+            modules/blocks/monitoring.nix
+            modules/blocks/nginx.nix
+            modules/blocks/postgresql.nix
+            modules/blocks/ssl.nix
+            modules/blocks/tinyproxy.nix
+            modules/blocks/vpn.nix
+
+            modules/services/arr.nix
+            modules/services/deluge.nix
+            modules/services/hledger.nix
+            modules/services/home-assistant.nix
+            modules/services/jellyfin.nix
+            modules/services/nextcloud-server.nix
+            modules/services/vaultwarden.nix
           ];
         };
 
diff --git a/modules/authelia.nix b/modules/blocks/authelia.nix
similarity index 100%
rename from modules/authelia.nix
rename to modules/blocks/authelia.nix
diff --git a/modules/backup.nix b/modules/blocks/backup.nix
similarity index 100%
rename from modules/backup.nix
rename to modules/blocks/backup.nix
diff --git a/modules/davfs.nix b/modules/blocks/davfs.nix
similarity index 100%
rename from modules/davfs.nix
rename to modules/blocks/davfs.nix
diff --git a/modules/ldap.nix b/modules/blocks/ldap.nix
similarity index 100%
rename from modules/ldap.nix
rename to modules/blocks/ldap.nix
diff --git a/modules/monitoring.nix b/modules/blocks/monitoring.nix
similarity index 100%
rename from modules/monitoring.nix
rename to modules/blocks/monitoring.nix
diff --git a/modules/nginx.nix b/modules/blocks/nginx.nix
similarity index 100%
rename from modules/nginx.nix
rename to modules/blocks/nginx.nix
diff --git a/modules/postgresql.nix b/modules/blocks/postgresql.nix
similarity index 100%
rename from modules/postgresql.nix
rename to modules/blocks/postgresql.nix
diff --git a/modules/ssl.nix b/modules/blocks/ssl.nix
similarity index 100%
rename from modules/ssl.nix
rename to modules/blocks/ssl.nix
diff --git a/modules/tinyproxy.nix b/modules/blocks/tinyproxy.nix
similarity index 100%
rename from modules/tinyproxy.nix
rename to modules/blocks/tinyproxy.nix
diff --git a/modules/vpn.nix b/modules/blocks/vpn.nix
similarity index 100%
rename from modules/vpn.nix
rename to modules/blocks/vpn.nix
diff --git a/modules/arr.nix b/modules/services/arr.nix
similarity index 100%
rename from modules/arr.nix
rename to modules/services/arr.nix
diff --git a/modules/deluge.nix b/modules/services/deluge.nix
similarity index 100%
rename from modules/deluge.nix
rename to modules/services/deluge.nix
diff --git a/modules/hledger.nix b/modules/services/hledger.nix
similarity index 100%
rename from modules/hledger.nix
rename to modules/services/hledger.nix
diff --git a/modules/home-assistant.nix b/modules/services/home-assistant.nix
similarity index 100%
rename from modules/home-assistant.nix
rename to modules/services/home-assistant.nix
diff --git a/modules/jellyfin.nix b/modules/services/jellyfin.nix
similarity index 100%
rename from modules/jellyfin.nix
rename to modules/services/jellyfin.nix
diff --git a/modules/nextcloud-server.nix b/modules/services/nextcloud-server.nix
similarity index 100%
rename from modules/nextcloud-server.nix
rename to modules/services/nextcloud-server.nix
diff --git a/modules/vaultwarden.nix b/modules/services/vaultwarden.nix
similarity index 100%
rename from modules/vaultwarden.nix
rename to modules/services/vaultwarden.nix