diff --git a/playbooks/groups/bwcloud.yml b/playbooks/group_bwcloud.yml
similarity index 100%
rename from playbooks/groups/bwcloud.yml
rename to playbooks/group_bwcloud.yml
diff --git a/playbooks/groups/os_raspbian.yml b/playbooks/group_os_raspbian.yml
similarity index 100%
rename from playbooks/groups/os_raspbian.yml
rename to playbooks/group_os_raspbian.yml
diff --git a/playbooks/hosts/nvak.banananet.work.yml b/playbooks/host_nvak.banananet.work.yml
similarity index 100%
rename from playbooks/hosts/nvak.banananet.work.yml
rename to playbooks/host_nvak.banananet.work.yml
diff --git a/playbooks/hosts/rurapenthe.banananet.work.yml b/playbooks/host_rurapenthe.banananet.work.yml
similarity index 100%
rename from playbooks/hosts/rurapenthe.banananet.work.yml
rename to playbooks/host_rurapenthe.banananet.work.yml
diff --git a/site.yml b/site.yml
index 6adde5a..bb54a59 100644
--- a/site.yml
+++ b/site.yml
@@ -49,9 +49,9 @@
 
 # Group specific configurations
 - name: Include configuration for group bwcloud
-  import_playbook: playbooks/groups/bwcloud.yml
+  import_playbook: playbooks/group_bwcloud.yml
 - name: Include configuration for group os_raspbian
-  import_playbook: playbooks/groups/os_raspbian.yml
+  import_playbook: playbooks/group_os_raspbian.yml
 
 # Topic specific configurations
 - name: Include wireguard network configuration
@@ -61,9 +61,9 @@
 
 # Host specific configurations
 - name: Include configuration of nvak.banananet.work
-  import_playbook: playbooks/hosts/nvak.banananet.work.yml
+  import_playbook: playbooks/host_nvak.banananet.work.yml
 - name: Include configuration of rurapenthe.banananet.work
-  import_playbook: playbooks/hosts/rurapenthe.banananet.work.yml
+  import_playbook: playbooks/host_rurapenthe.banananet.work.yml
 
 - hosts: hardie.eridon.banananet.work
   roles: