diff --git a/handlers/main.yml b/handlers/main.yml
deleted file mode 100644
index 0da2266..0000000
--- a/handlers/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- name: Enable tor
-  systemd:
-        name: 'tor@default'
-        enabled: yes
-        state: restarted
-        daemon_reload: yes
-- name: Restart tor
-  systemd:
-        name: 'tor@default'
-        state: restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 14cbe61..15926e7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,27 +1,10 @@
-- name: Create configuration directory
-  file:
-        path: '/etc/tor'
-        state: directory
-  tags:
-        - setup
-        - configs
 - name: Copy configuration files
+  loop:
+        - { src: 'torrc.j2', dest: '/etc/tor/torrc' }
   template:
         follow: yes
-        src: 'torrc.j2'
-        dest: '/etc/tor/torrc'
-  notify: Restart tor
+        src: '{{ item.src }}'
+        dest: '{{ item.dest }}'
+  notify: Run service actions
   tags:
-        - update
-        - configs
-- name: Install tor
-  apt:
-        install_recommends: no
-        name:
-                - tor
-        state: present
-        cache_valid_time: 3600
-  tags:
-        - setup
-        - packages
-  notify: Enable tor
+        - config