diff --git a/tasks/apache.yml b/tasks/apache/install.yml
similarity index 100%
rename from tasks/apache.yml
rename to tasks/apache/install.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index d2d1cf8..b92e592 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,10 +5,10 @@
 - include_tasks: iptables.yml
 - include_tasks: certbot.yml
 
-- include_tasks: apache.yml
+- include_tasks: apache/install.yml
   when: common__apache__state == 'install'
 - meta: flush_handlers
 
-- include_tasks: nginx.yml
+- include_tasks: nginx/install.yml
   when: common__nginx__state == 'install'
 - meta: flush_handlers
diff --git a/tasks/nginx.yml b/tasks/nginx/install.yml
similarity index 100%
rename from tasks/nginx.yml
rename to tasks/nginx/install.yml