diff --git a/init.el b/init.el
index 09b9977..f5bc5d6 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,9 @@
 (package-initialize)
 
+(add-to-list 'load-path (concat
+                         user-emacs-directory
+                         (convert-standard-filename "lisp/")))
+
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -85,20 +89,20 @@
 (add-hook 'after-init-hook 'nyan-mode)
 (add-hook 'after-init-hook 'global-wakatime-mode)
 (add-hook 'after-init-hook (lambda () (require 'magit-gerrit)))
-(require 'move-line)
-(require 'whitespace)
-(require 'rcirc)
-(require 'thingatpt)
-(require 'gobgen)
 
+(add-hook 'after-init-hook (lambda () (require 'move-line)))
+(add-hook 'after-init-hook (lambda () (require 'whitespace)))
+(add-hook 'after-init-hook (lambda () (require 'rcirc)))
+(add-hook 'after-init-hook (lambda () (require 'thingatpt)))
+(add-hook 'after-init-hook (lambda () (require 'gobgen)))
 
-(load (concat user-emacs-directory "gnu-c-header.el"))
-(load (concat user-emacs-directory "toggle-window-split.el"))
-(load (concat user-emacs-directory "round-number-to-decimals.el"))
-(load (concat user-emacs-directory "transpose-windows.el"))
-(load (concat user-emacs-directory "zim.el"))
-(load (concat user-emacs-directory "clearcase.el"))
-(load (concat user-emacs-directory "jekyll.el"))
+(load "gnu-c-header.el")
+(load "toggle-window-split.el")
+(load "round-number-to-decimals.el")
+(load "transpose-windows.el")
+(load "zim.el")
+(load "clearcase.el")
+(load "jekyll.el")
 
 (add-hook 'c-mode-hook
           (lambda ()
diff --git a/clearcase.el b/lisp/clearcase.el
similarity index 100%
rename from clearcase.el
rename to lisp/clearcase.el
diff --git a/gnu-c-header.el b/lisp/gnu-c-header.el
similarity index 100%
rename from gnu-c-header.el
rename to lisp/gnu-c-header.el
diff --git a/jekyll.el b/lisp/jekyll.el
similarity index 100%
rename from jekyll.el
rename to lisp/jekyll.el
diff --git a/round-number-to-decimals.el b/lisp/round-number-to-decimals.el
similarity index 100%
rename from round-number-to-decimals.el
rename to lisp/round-number-to-decimals.el
diff --git a/toggle-window-split.el b/lisp/toggle-window-split.el
similarity index 100%
rename from toggle-window-split.el
rename to lisp/toggle-window-split.el
diff --git a/transpose-windows.el b/lisp/transpose-windows.el
similarity index 100%
rename from transpose-windows.el
rename to lisp/transpose-windows.el
diff --git a/zim.el b/lisp/zim.el
similarity index 100%
rename from zim.el
rename to lisp/zim.el