diff --git a/.gitignore b/.gitignore
index 620c18055..0f9b0bae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 auto-save-list/
 clones/
 elpa/
-init-irc.el
-init-local.el
+irc.el
+local.el
 other/
 scripts/
 themes/
diff --git a/init-evil.el b/init-evil.el
deleted file mode 100644
index ae2e9fd03..000000000
--- a/init-evil.el
+++ /dev/null
@@ -1,23 +0,0 @@
-; Basic vim emulation
-
-(evil-mode t)
-; (global-evil-tabs-mode 1)
-
-(evil-ex-define-cmd "Exp[lore]" 'dired-jump)
-(evil-ex-define-cmd "color[scheme]" 'customize-themes)
-
-(evil-define-key 'normal global-map
-  "\\\\w" 'evil-ace-jump-word-mode)
-
-(evil-define-key 'normal clojure-mode-map
-  "\M-q" 'paredit-reindent-defun
-  "gK" 'nrepl-src
-  "K"  'ac-nrepl-popup-doc)
-
-(setq evil-default-cursor '("#ffdd33"))
-
-;;; Uncomment these key-chord lines if you like that "remap 'jk' to ESC" trick.
-;; (key-chord-mode t)
-;; (key-chord-define evil-insert-state-map "jk" 'evil-normal-state)
-
-(provide 'init-evil)
diff --git a/init.el b/init.el
index 90fc92c09..d91f536e1 100644
--- a/init.el
+++ b/init.el
@@ -85,18 +85,16 @@
 
 (add-to-list 'load-path user-emacs-directory)
 
-(mapc 'require '(init-functions
-                 init-settings
-                 init-modes
-                 init-bindings
-                 init-eshell))
+(mapc 'require '(functions
+                 settings
+                 modes
+                 bindings
+                 eshell-setup))
 
 (when is-vim-mode
   (require 'init-evil))
 
-(add-to-list 'load-path "~/.emacs.d/scripts/")
-
-(setq custom-file "~/.emacs.d/init-custom.el")
+(setq custom-file (concat user-emacs-directory "init/custom.el"))
 (load custom-file)
 
 ;; A file with machine specific settings.
diff --git a/init-bindings.el b/init/bindings.el
similarity index 99%
rename from init-bindings.el
rename to init/bindings.el
index 9a4157ba1..d29081d17 100644
--- a/init-bindings.el
+++ b/init/bindings.el
@@ -72,4 +72,4 @@
 ;; Org-mode agenda keys
 (global-set-key (kbd "C-c a") 'org-agenda)
 
-(provide 'init-bindings)
+(provide 'bindings)
diff --git a/init-custom.el b/init/custom.el
similarity index 100%
rename from init-custom.el
rename to init/custom.el
diff --git a/init-eshell.el b/init/eshell-setup.el
similarity index 99%
rename from init-eshell.el
rename to init/eshell-setup.el
index 69c710486..43b1c16b3 100644
--- a/init-eshell.el
+++ b/init/eshell-setup.el
@@ -89,4 +89,4 @@
   (let ((inhibit-read-only t))
     (erase-buffer)))
 
-(provide 'init-eshell)
+(provide 'eshell-setup)
diff --git a/init-functions.el b/init/functions.el
similarity index 99%
rename from init-functions.el
rename to init/functions.el
index 233d40dd8..e26e1f1be 100644
--- a/init-functions.el
+++ b/init/functions.el
@@ -99,4 +99,4 @@ Including indent-buffer, which should not be called automatically on save."
       (find-file (concat "/sudo:root@localhost:" (ido-read-file-name "File: ")))
     (find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name))))
 
-(provide 'init-functions)
+(provide 'functions)
diff --git a/init-misc.el b/init/misc.el
similarity index 92%
rename from init-misc.el
rename to init/misc.el
index 87343205b..940370493 100644
--- a/init-misc.el
+++ b/init/misc.el
@@ -6,4 +6,4 @@
 ;; Use aspell for spell checking: brew install aspell --lang=en
 (setq ispell-program-name "/usr/local/bin/aspell")
 
-(provide 'init-misc)
+(provide 'misc)
diff --git a/init-modes.el b/init/modes.el
similarity index 99%
rename from init-modes.el
rename to init/modes.el
index 9141404b7..a28ece3e5 100644
--- a/init-modes.el
+++ b/init/modes.el
@@ -77,4 +77,4 @@
 ;; Transparently open compressed files
 (auto-compression-mode t)
 
-(provide 'init-modes)
+(provide 'modes)
diff --git a/init-settings.el b/init/settings.el
similarity index 99%
rename from init-settings.el
rename to init/settings.el
index 9601752ec..8d1b7fbac 100644
--- a/init-settings.el
+++ b/init/settings.el
@@ -240,4 +240,4 @@
 (setq lpr-command "xpp")
 
 
-(provide 'init-settings)
+(provide 'settings)