diff --git a/playbooks/arch_upgrade.yml b/arch_upgrade.yml
similarity index 100%
rename from playbooks/arch_upgrade.yml
rename to arch_upgrade.yml
diff --git a/playbooks/roles/arch/tasks/aur_rebuild.yml b/aur_rebuild.yml
similarity index 100%
rename from playbooks/roles/arch/tasks/aur_rebuild.yml
rename to aur_rebuild.yml
diff --git a/playbooks/build_needs_reboot.yml b/build_needs_reboot.yml
similarity index 100%
rename from playbooks/build_needs_reboot.yml
rename to build_needs_reboot.yml
diff --git a/playbooks/debian_upgrade.yml b/debian_upgrade.yml
similarity index 100%
rename from playbooks/debian_upgrade.yml
rename to debian_upgrade.yml
diff --git a/playbooks/roles/common/scripts/kernel_func b/kernel_func
similarity index 100%
rename from playbooks/roles/common/scripts/kernel_func
rename to kernel_func
diff --git a/playbooks/roles/common/tasks/reboot.yml b/reboot.yml
similarity index 87%
rename from playbooks/roles/common/tasks/reboot.yml
rename to reboot.yml
index 8e12543..2590bcd 100644
--- a/playbooks/roles/common/tasks/reboot.yml
+++ b/reboot.yml
@@ -1,5 +1,5 @@
 - name:  Stop mollyguard if active
-  ansible.builtin.script:  scripts/stop_mollyguard
+  ansible.builtin.script:  stop_mollyguard
   register:  mg
 - name:  Determine if a reboot is necessary
   ansible.builtin.command:
diff --git a/playbooks/roles/common/scripts/stop_mollyguard b/stop_mollyguard
similarity index 100%
rename from playbooks/roles/common/scripts/stop_mollyguard
rename to stop_mollyguard