diff --git a/constructor.yml b/playbook.constructor.yml
similarity index 86%
rename from constructor.yml
rename to playbook.constructor.yml
index b49e754f..be2e1259 100644
--- a/constructor.yml
+++ b/playbook.constructor.yml
@@ -7,13 +7,6 @@
     - role: update
       when: mode_update | bool
 
-- name: optimize storage performance
-  hosts:  all
-  become: true
-  roles:
-    - role: system-storage-optimizer
-      when: path_mass_storage or path_rapid_storage
-
 - name: setup standard wireguard
   hosts: wireguard_server
   become: true
diff --git a/playbook.destructor.yml b/playbook.destructor.yml
new file mode 100644
index 00000000..d811531e
--- /dev/null
+++ b/playbook.destructor.yml
@@ -0,0 +1,6 @@
+- name: optimize storage performance
+  hosts:  all
+  become: true
+  roles:
+    - role: system-storage-optimizer
+      when: path_mass_storage or path_rapid_storage
\ No newline at end of file
diff --git a/end_users.yml b/playbook.pcs.yml
similarity index 94%
rename from end_users.yml
rename to playbook.pcs.yml
index 8d3c0193..a5d32c5e 100644
--- a/end_users.yml
+++ b/playbook.pcs.yml
@@ -1,6 +1,6 @@
 ---
 
-- import_playbook: playbook-common.yml
+- import_playbook: playbook.constructor.yml
 
 ## pc applications
 - name: general host setup
@@ -102,4 +102,4 @@
   roles:
     - driver-msi-keyboard-color
 
-- import_playbook: destructor.yml
\ No newline at end of file
+- import_playbook: playbook.destructor.yml
\ No newline at end of file
diff --git a/servers.yml b/playbook.servers.yml
similarity index 98%
rename from servers.yml
rename to playbook.servers.yml
index d1c955eb..76e40470 100644
--- a/servers.yml
+++ b/playbook.servers.yml
@@ -1,6 +1,6 @@
 ---
 
-- import_playbook: constructor.yml
+- import_playbook: playbook.constructor.yml
 
 - name: servers host setup
   hosts: servers
@@ -269,3 +269,5 @@
   become: true
   roles:
    -  role: nginx-www-redirect
+
+- import_playbook: playbook.destructor.yml
\ No newline at end of file