diff --git a/deploy.sh b/deploy.sh
index a45d51d..da8736b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,12 +2,10 @@
 
 set -e
 
-puppet apply manifests/main.pp --modulepath=modules/ --verbose
+puppet apply manifests/pre-packages.pp --modulepath=modules/ --verbose
 
 patch /usr/bin/makepkg -N < makepkg.patch
-
 puppet apply manifests/packages.pp --verbose
-
 patch /usr/bin/makepkg -NR < makepkg.patch
 
-puppet apply manifests/post-packages.pp --verbose
+puppet apply manifests/main.pp --modulepath=modules/ --verbose
diff --git a/manifests/main.pp b/manifests/main.pp
index 288dc07..28cef80 100644
--- a/manifests/main.pp
+++ b/manifests/main.pp
@@ -6,7 +6,6 @@ node default {
   include stdlib
 
   include common
-  include yaourt
   include gnome
   include config
   include shell
diff --git a/manifests/post-packages.pp b/manifests/post-packages.pp
deleted file mode 100644
index f1a0cbf..0000000
--- a/manifests/post-packages.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-node default {
-  Exec {
-    path => ['/usr/bin', '/usr/sbin', '/usr/local/bin', '/usr/local/sbin']
-  }
-
-  file {'Autostart Compton':
-    ensure => link,
-    path => '/home/jake/.config/autostart/compton.desktop',
-    mode => '0644',
-    owner => 'jake',
-    source => '/usr/share/applications/compton.desktop'
-  }
-
-  exec {'Set Java version':
-    command => 'archlinux-java set intellij-jdk',
-    unless => 'archlinux-java get | grep intellij-jdk'
-  }
-}
diff --git a/manifests/pre-package.pp b/manifests/pre-package.pp
new file mode 100644
index 0000000..dcac869
--- /dev/null
+++ b/manifests/pre-package.pp
@@ -0,0 +1,5 @@
+node default {
+  include stdlib
+
+  include yaourt
+}
diff --git a/modules/common/manifests/init.pp b/modules/common/manifests/init.pp
index 1dc670f..ee4ba47 100644
--- a/modules/common/manifests/init.pp
+++ b/modules/common/manifests/init.pp
@@ -12,4 +12,9 @@ class common {
     path => '/home/jake',
     owner => 'jake'
   }
+
+  exec {'Set Java version':
+    command => 'archlinux-java set intellij-jdk',
+    unless => 'archlinux-java get | grep intellij-jdk'
+  }
 }
diff --git a/modules/i3/manifests/autostart.pp b/modules/i3/manifests/autostart.pp
index 52012df..ee0be45 100644
--- a/modules/i3/manifests/autostart.pp
+++ b/modules/i3/manifests/autostart.pp
@@ -25,4 +25,12 @@ class i3::autostart {
       source => "/etc/xdg/autostart/$program.desktop"
     }
   }
+
+  file {'Autostart Compton':
+    ensure => link,
+    path => '/home/jake/.config/autostart/compton.desktop',
+    mode => '0644',
+    owner => 'jake',
+    source => '/usr/share/applications/compton.desktop'
+  }
 }