diff --git a/dotfiles.yml b/dotfiles.yml
index 46c7602..6177984 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -11,13 +11,9 @@
         file: host_vars/{{ ansible_hostname }}.yml
       failed_when: false
 
-    - import_tasks: tasks/user.yml
-    - import_tasks: tasks/packages.yml
-
     - include_role:
-        name: geerlingguy.ntp
+        name: base
 
-    - import_tasks: tasks/boot.yml
     - import_tasks: tasks/i3.yml
 
     # Don't bother configuring KDE for root, just assume it's for me
diff --git a/tasks/boot.yml b/roles/base/tasks/boot.yml
similarity index 100%
rename from tasks/boot.yml
rename to roles/base/tasks/boot.yml
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
new file mode 100644
index 0000000..eafd4d5
--- /dev/null
+++ b/roles/base/tasks/main.yml
@@ -0,0 +1,7 @@
+- import_tasks: user.yml
+- import_tasks: packages.yml
+
+- include_role:
+    name: geerlingguy.ntp
+
+- import_tasks: boot.yml
diff --git a/tasks/packages.yml b/roles/base/tasks/packages.yml
similarity index 100%
rename from tasks/packages.yml
rename to roles/base/tasks/packages.yml
diff --git a/tasks/user.yml b/roles/base/tasks/user.yml
similarity index 100%
rename from tasks/user.yml
rename to roles/base/tasks/user.yml