diff --git a/playbook.yaml b/playbook.yaml
index 151b544..e81428d 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -4,12 +4,6 @@
 - name: "install and configure the Zabbix Agent"
   hosts: "all"
   become: true
-
-  # execute dependancy playbook
   roles:
     - role: "zabbix_prereq"
-
-  # execute this playbook
-  tasks:
-    - include_role:
-        name: "."
+    - role: "zabbix_agent"
diff --git a/requirements.yml b/roles/requirements.yml
similarity index 100%
rename from requirements.yml
rename to roles/requirements.yml
diff --git a/defaults/main.yaml b/roles/zabbix_agent/defaults/main.yaml
similarity index 100%
rename from defaults/main.yaml
rename to roles/zabbix_agent/defaults/main.yaml
diff --git a/files/zabbix/plugins.d/nvidia.conf b/roles/zabbix_agent/files/zabbix/plugins.d/nvidia.conf
similarity index 100%
rename from files/zabbix/plugins.d/nvidia.conf
rename to roles/zabbix_agent/files/zabbix/plugins.d/nvidia.conf
diff --git a/handlers/main.yaml b/roles/zabbix_agent/handlers/main.yaml
similarity index 100%
rename from handlers/main.yaml
rename to roles/zabbix_agent/handlers/main.yaml
diff --git a/meta/main.yaml b/roles/zabbix_agent/meta/main.yaml
similarity index 100%
rename from meta/main.yaml
rename to roles/zabbix_agent/meta/main.yaml
diff --git a/tasks/config.yaml b/roles/zabbix_agent/tasks/config.yaml
similarity index 100%
rename from tasks/config.yaml
rename to roles/zabbix_agent/tasks/config.yaml
diff --git a/tasks/install.yaml b/roles/zabbix_agent/tasks/install.yaml
similarity index 100%
rename from tasks/install.yaml
rename to roles/zabbix_agent/tasks/install.yaml
diff --git a/tasks/main.yaml b/roles/zabbix_agent/tasks/main.yaml
similarity index 100%
rename from tasks/main.yaml
rename to roles/zabbix_agent/tasks/main.yaml
diff --git a/templates/sudoers.d/zabbix.j2 b/roles/zabbix_agent/templates/sudoers.d/zabbix.j2
similarity index 100%
rename from templates/sudoers.d/zabbix.j2
rename to roles/zabbix_agent/templates/sudoers.d/zabbix.j2
diff --git a/templates/zabbix/zabbix_agent.conf.j2 b/roles/zabbix_agent/templates/zabbix/zabbix_agent.conf.j2
similarity index 100%
rename from templates/zabbix/zabbix_agent.conf.j2
rename to roles/zabbix_agent/templates/zabbix/zabbix_agent.conf.j2
diff --git a/templates/zabbix/zabbix_agent.psk.j2 b/roles/zabbix_agent/templates/zabbix/zabbix_agent.psk.j2
similarity index 100%
rename from templates/zabbix/zabbix_agent.psk.j2
rename to roles/zabbix_agent/templates/zabbix/zabbix_agent.psk.j2