diff --git a/roles/confapache/meta/main.yml b/roles/apache-conf-2px/meta/main.yml
similarity index 100%
rename from roles/confapache/meta/main.yml
rename to roles/apache-conf-2px/meta/main.yml
diff --git a/roles/apache-conf-2px/tasks/main.yml b/roles/apache-conf-2px/tasks/main.yml
new file mode 100644
index 0000000..a0b5025
--- /dev/null
+++ b/roles/apache-conf-2px/tasks/main.yml
@@ -0,0 +1,9 @@
+---
+
+- name: "2px directory"
+  file:
+    path: "{{ 2px_directory }}"
+    owner: "flyingscorpio"
+    group: "flyingscorpio"
+    state: directory
+    mode: '0775'
diff --git a/roles/confdb/meta/main.yml b/roles/apache-conf-tunuifranken/meta/main.yml
similarity index 100%
rename from roles/confdb/meta/main.yml
rename to roles/apache-conf-tunuifranken/meta/main.yml
diff --git a/roles/confapache/tasks/main.yml b/roles/apache-conf-tunuifranken/tasks/main.yml
similarity index 53%
rename from roles/confapache/tasks/main.yml
rename to roles/apache-conf-tunuifranken/tasks/main.yml
index 690c3fe..74e4f22 100644
--- a/roles/confapache/tasks/main.yml
+++ b/roles/apache-conf-tunuifranken/tasks/main.yml
@@ -1,13 +1,5 @@
 ---
 
-- name: "2px directory"
-  file:
-    path: "{{ 2px_directory }}"
-    owner: "flyingscorpio"
-    group: "flyingscorpio"
-    state: directory
-    mode: '0775'
-
 - name: "tunuifranken directory"
   file:
     path: "{{ tunuifranken_directory }}"
diff --git a/roles/apache/handlers/main.yml b/roles/apache-install/handlers/main.yml
similarity index 100%
rename from roles/apache/handlers/main.yml
rename to roles/apache-install/handlers/main.yml
diff --git a/roles/apache/tasks/main.yml b/roles/apache-install/tasks/main.yml
similarity index 100%
rename from roles/apache/tasks/main.yml
rename to roles/apache-install/tasks/main.yml
diff --git a/roles/mariadb-conf-2px/meta/main.yml b/roles/mariadb-conf-2px/meta/main.yml
new file mode 100644
index 0000000..9711b33
--- /dev/null
+++ b/roles/mariadb-conf-2px/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - role: common
diff --git a/roles/confdb/tasks/main.yml b/roles/mariadb-conf-2px/tasks/main.yml
similarity index 100%
rename from roles/confdb/tasks/main.yml
rename to roles/mariadb-conf-2px/tasks/main.yml
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb-install/tasks/main.yml
similarity index 100%
rename from roles/mariadb/tasks/main.yml
rename to roles/mariadb-install/tasks/main.yml