diff --git a/init-load-path.el b/init-packages.el
similarity index 54%
rename from init-load-path.el
rename to init-packages.el
index b4542877c..a0263e5db 100644
--- a/init-load-path.el
+++ b/init-packages.el
@@ -1,30 +1,34 @@
-;;; init-load-path.el
+;;; init-packages.el
 
 (setq-default
- byte-compile-warnings nil
  ;; stop package.el from being annoying. NARF relies entirely on Cask.
  package--init-file-ensured t
  package-enable-at-startup nil)
 
-(eval-and-compile
-  (defconst narf-emacs-dir     user-emacs-directory)
-  (defconst narf-core-dir      (concat narf-emacs-dir "core/"))
-  (defconst narf-modules-dir   (concat narf-emacs-dir "modules/"))
-  (defconst narf-contrib-dir   (concat narf-emacs-dir "contrib/"))
-  (defconst narf-private-dir   (concat narf-emacs-dir "private/"))
-  (defconst narf-elpa-dir      (concat narf-emacs-dir ".cask/" emacs-version "/elpa/"))
+(defconst narf-emacs-dir     user-emacs-directory)
+(defconst narf-core-dir      (concat narf-emacs-dir "core/"))
+(defconst narf-modules-dir   (concat narf-emacs-dir "modules/"))
+(defconst narf-contrib-dir   (concat narf-emacs-dir "contrib/"))
+(defconst narf-private-dir   (concat narf-emacs-dir "private/"))
+(defconst narf-packages-dir  (concat narf-emacs-dir ".packages/"))
 
-  (defconst narf-script-dir    (concat narf-emacs-dir "scripts/"))
-  (defconst narf-dropbox-dir   "~/Dropbox/")
-  (defconst narf-snippet-dirs  (list (concat narf-private-dir "snippets/")
-                                     (concat narf-private-dir "templates/")))
-  (defconst narf-temp-dir
-    (format "%scache/%s/%s.%s/"
-            narf-private-dir (system-name)
-            emacs-major-version emacs-minor-version)))
+(defconst narf-script-dir    (concat narf-emacs-dir "scripts/"))
+(defconst narf-dropbox-dir   "~/Dropbox/")
+(defconst narf-snippet-dirs  (list (concat narf-private-dir "snippets/")
+                                   (concat narf-private-dir "templates/")))
+(defconst narf-temp-dir
+  (format "%scache/%s/%s.%s/"
+          narf-private-dir (system-name)
+          emacs-major-version emacs-minor-version))
+
+(defconst IS-MAC     (eq system-type 'darwin))
+(defconst IS-LINUX   (eq system-type 'gnu/linux))
+(defconst IS-WINDOWS (eq system-type 'windows-nt))
+
+;;;;;;;;;;;;;;;;
 
 (eval-when-compile
-  (add-to-list 'load-path "/usr/local/share/emacs/site-lisp/cask")
+  (add-to-list 'load-path "/usr/local/bin/cask")
   (defun --subdirs (path)
     (let ((result '())
           (paths (ignore-errors (directory-files path t "^[^.]" t))))
@@ -47,13 +51,15 @@
                                 (list (concat narf-core-dir "lib"))
                                 (list (concat narf-modules-dir "lib"))
                                 (--subdirs narf-contrib-dir)
+                                (--subdirs (concat narf-packages-dir "el-get/"))
                                 load-path))))
 
-(defconst IS-MAC     (eq system-type 'darwin))
-(defconst IS-LINUX   (eq system-type 'gnu/linux))
-(defconst IS-WINDOWS (eq system-type 'windows-nt))
+;;;;;;;;;;;;;;;;
+
+(autoload 'use-package "use-package" "" nil 'macro)
+(require 'dash)
 
 (when (file-exists-p "~/.emacs.local.el")
   (load "~/.emacs.local.el"))
 
-;;; init-load-path.el ends here
+;;; init-packages.el ends here
diff --git a/init.el b/init.el
index 34b195b27..48bd05dfd 100644
--- a/init.el
+++ b/init.el
@@ -51,7 +51,7 @@
   (scroll-bar-mode -1)  ; no scrollbar
   (tool-bar-mode   -1)  ; no toolbar
 
-  (load (concat user-emacs-directory "init-load-path.el"))
+  (load (concat user-emacs-directory "init-packages.el"))
   (load-theme narf-theme t)
 
   (mapc 'require
diff --git a/scripts/byte-compile.el b/scripts/byte-compile.el
index 7d64dd8c6..62bb4262c 100755
--- a/scripts/byte-compile.el
+++ b/scripts/byte-compile.el
@@ -1,6 +1,6 @@
 #!emacs --script
 
-(load (concat user-emacs-directory "init.el"))
+(load (concat user-emacs-directory "init-packages.el"))
 
 (require 'bytecomp)
 (byte-recompile-file (expand-file-name "init-load-path.el" narf-emacs-dir) nil 0)
diff --git a/scripts/generate-autoloads.el b/scripts/generate-autoloads.el
index 3e1c41bdd..18e8b8b40 100755
--- a/scripts/generate-autoloads.el
+++ b/scripts/generate-autoloads.el
@@ -1,6 +1,6 @@
 #!emacs --script
 
-(load (concat user-emacs-directory "init-load-path.el"))
+(load (concat user-emacs-directory "init-packages.el"))
 
 (require 'f)
 (setq generated-autoload-file (concat narf-core-dir "autoloads.el"))