diff --git a/compile-emacs.el b/compile-emacs.el
deleted file mode 100644
index 239b8b4..0000000
--- a/compile-emacs.el
+++ /dev/null
@@ -1,6 +0,0 @@
-(add-to-list 'load-path "~/.emacs.d/elisp")
-(add-to-list 'load-path "~/.emacs.d/naquadah-theme")
-(add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode")
-(add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
-
-(byte-compile-file "emacs.el")
diff --git a/emacs.el b/emacs.d/init.el
similarity index 96%
rename from emacs.el
rename to emacs.d/init.el
index 5d55db7..4c74dec 100644
--- a/emacs.el
+++ b/emacs.d/init.el
@@ -1,5 +1,5 @@
 ;; -*- mode: Emacs-Lisp; -*-
-(add-to-list 'load-path "~/.emacs.d/elisp")
+(load "~/.emacs.d/ryuslash-load-path")
 
 ;;; Autopair
 (require 'autopair)
@@ -62,7 +62,6 @@
 (org-crypt-use-before-save-magic)
 
 ;;; Rainbow delimiters
-(add-to-list 'load-path "~/.emacs.d/elisp/rainbow-delimiters")
 (require 'rainbow-delimiters)
 (setq rainbow-delimiters-max-face-count 8)
 
@@ -88,7 +87,6 @@
 (require 'git)
 
 ;;; Markdown mode
-(add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode")
 (autoload 'markdown-mode "markdown-mode" "Major mode for Markdown" t)
 (setq whitespace-style '(face trailing)) ; For use with markdown mode
 (add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?do?wn$". markdown-mode))
@@ -98,16 +96,10 @@
             (turn-on-auto-fill)))
 
 ;;; Zencoding mode
-(add-to-list 'load-path "~/.emacs.d/elisp/zencoding")
 (autoload 'zencoding-mode "zencoding-mode" "Minor mode for zencoding" t)
 (add-hook 'sgml-mode-hook 'zencoding-mode) ; Auto-start on any markup
                                         ; modes
 
-(add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
-(add-to-list 'load-path "~/.emacs.d/elisp/lua-mode")
-(add-to-list 'load-path "~/.emacs.d/elisp/pi-php-mode")
-(add-to-list 'load-path "~/.emacs.d/elisp/rainbow")
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                          REQUIRES                          ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/emacs.d/ryuslash-load-path.el b/emacs.d/ryuslash-load-path.el
new file mode 100644
index 0000000..984c136
--- /dev/null
+++ b/emacs.d/ryuslash-load-path.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "~/.emacs.d/elisp")
+(add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
+(add-to-list 'load-path "~/.emacs.d/elisp/lua-mode")
+(add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode")
+(add-to-list 'load-path "~/.emacs.d/elisp/pi-php-mode")
+(add-to-list 'load-path "~/.emacs.d/elisp/rainbow")
+(add-to-list 'load-path "~/.emacs.d/elisp/rainbow-delimiters")
+(add-to-list 'load-path "~/.emacs.d/elisp/zencoding")
+
+(provide 'ryuslash-load-path)
diff --git a/install.sh b/install.sh
index 4cfb500..38f758d 100755
--- a/install.sh
+++ b/install.sh
@@ -48,9 +48,7 @@ linkmy conkeror .conkeror
 linkmy conkyrc .conkyrc
 copymy conky_box.lua .conky_box.lua
 # EMACS
-linkmy emacs.el .emacs.el
-emacs --script compile-emacs.el || return 1
-linkmy emacs.elc .emacs.elc
+emacs --batch -l emacs.d/init.el --eval "(byte-compile-file \"emacs.d/init.el\")" || return 1
 linkmy emacs.d .emacs.d
 # FONTS
 linkmy fonts.conf .fonts.conf