diff --git a/main.yml b/main.yml
new file mode 100644
index 0000000..9189d69
--- /dev/null
+++ b/main.yml
@@ -0,0 +1,10 @@
+---
+- name: Deploy and configure a runner on target machine
+  hosts: gitrunner
+  become: true
+  gather_facts: true
+
+  roles:
+    - update.yml
+    - host_setup.yml
+    - runner_setup.yml
diff --git a/host-as-runner-config.yml b/roles/host-as-runner-config.yml
similarity index 100%
rename from host-as-runner-config.yml
rename to roles/host-as-runner-config.yml
diff --git a/host_setup.yml b/roles/host_setup.yml
similarity index 98%
rename from host_setup.yml
rename to roles/host_setup.yml
index 4e89e8a..bd9a788 100644
--- a/host_setup.yml
+++ b/roles/host_setup.yml
@@ -11,6 +11,7 @@
           - docker
           - nodejs
           - git
+          - mock
         state: present
         update_cache: true
 
diff --git a/runner_setup.yml b/roles/runner_setup.yml
similarity index 99%
rename from runner_setup.yml
rename to roles/runner_setup.yml
index c7b29e6..e22d05e 100644
--- a/runner_setup.yml
+++ b/roles/runner_setup.yml
@@ -128,4 +128,4 @@
         name: act_runner
         enabled: true
         state: started
-        daemon_reload: true
\ No newline at end of file
+        daemon_reload: true
diff --git a/update.yml b/roles/update.yml
similarity index 100%
rename from update.yml
rename to roles/update.yml