diff --git a/contrapunctus/cp-fm.el b/contrapunctus/cp-fm.el
index 768c42d..b8ed712 100644
--- a/contrapunctus/cp-fm.el
+++ b/contrapunctus/cp-fm.el
@@ -181,6 +181,7 @@
          ("I" . sxiv)))
 
 (use-package contrasync
+  :load-path "~/.emacs.d/contrapunctus/contrasync/"
   :config
   (setq contrasync-disk-path "/media/anon/kash-sg-2tb/"
         contrasync-source-paths
diff --git a/contrapunctus/cp-hindi.el b/contrapunctus/cp-hindi.el
index b597b90..5952d50 100644
--- a/contrapunctus/cp-hindi.el
+++ b/contrapunctus/cp-hindi.el
@@ -82,3 +82,5 @@
 ;; (gethash "ऩ्" (car indian-dev-itrans-v5-hash))
 ;; (gethash "न्ह" (car indian-dev-itrans-v5-hash))
 ;; (gethash "nh" (cdr indian-dev-itrans-v5-hash))
+
+(provide 'cp-hindi)
diff --git a/contrapunctus/cp-lisp.el b/contrapunctus/cp-lisp.el
index b83af72..17d1722 100644
--- a/contrapunctus/cp-lisp.el
+++ b/contrapunctus/cp-lisp.el
@@ -91,14 +91,6 @@ active, else `sp-copy-sexp'."
 
 (add-hook 'compilation-filter-hook 'colorize-compilation-buffer)
 
-(update-file-autoloads "~/.emacs.d/elisp-git/clojure-mode/clojure-mode.el"
-                       t
-                       "~/.emacs.d/elisp-git/clojure-mode/clojure-autoloads.el")
-(load "clojure-autoloads")
-;; (autoload 'clojure-mode "clojure-mode" nil t)
-(with-eval-after-load "clojure-mode"
-  (require 'cider))
-
 (use-package nameless
   :ensure t
   :commands nameless-mode
diff --git a/contrapunctus/cp-parens.el b/contrapunctus/cp-parens.el
index 929fa3a..0147197 100644
--- a/contrapunctus/cp-parens.el
+++ b/contrapunctus/cp-parens.el
@@ -262,3 +262,5 @@
 ;; (define-key scheme-mode-map (kbd "M-w") 'paredit-copy-as-kill)
 ;; (define-key scheme-mode-map (kbd "C-h") 'paredit-backward-delete)
 ;; (define-key scheme-mode-map (kbd "C-w") 'paredit-backward-kill-word)
+
+(provide 'cp-parens)
diff --git a/contrapunctus/cp-ui.el b/contrapunctus/cp-ui.el
index dfaee07..d7697c0 100644
--- a/contrapunctus/cp-ui.el
+++ b/contrapunctus/cp-ui.el
@@ -57,3 +57,5 @@
   ;; if height of window > width, we're in a vertical split
   ;; otherwise we're in a horizontal split
 )
+
+(provide 'cp-ui)
diff --git a/init.el b/init.el
index c3a36e0..864a0e7 100644
--- a/init.el
+++ b/init.el
@@ -58,24 +58,8 @@
     (add-to-list 'package-archives '("gnu" . (concat proto "://elpa.gnu.org/packages/")))))
 (package-initialize)
 
-;; from https://github.com/jorgenschaefer/Config/blob/master/emacs.el#L796-L800
-(mapc (lambda (path)
-        (when (file-directory-p path)
-          (add-to-list 'load-path path)
-          (dolist (dirname (directory-files path t "^[^.]"))
-            (when (file-directory-p dirname)
-              (let ((try1 (concat dirname "/elisp"))
-                    (try2 (concat dirname "/lisp")))
-                (add-to-list 'load-path
-                             (cond ((file-exists-p try1) try1)
-                                   ((file-exists-p try2) try2)
-                                   (t dirname))))))))
-      '("~/.emacs.d/elisp-git/"
-        "~/.emacs.d/contrapunctus"
-        "~/.emacs.d/elpa/"
-        "~/.emacs.d/user"))
-
-(load "cp-ui")
+(use-package "cp-ui"
+  :load-path "~/.emacs.d/contrapunctus/")
 
 (require 'atomic-chrome)
 (atomic-chrome-start-server)
@@ -634,15 +618,13 @@ and eval it."
                                        file-path-shell))))))
 (add-hook 'after-save-hook 'cp/after-save)
 
-;; (load "cp-helm")
-(load "cp-hindi")
-;; (load "cp-irc")
-(load "cp-parens")
-(load "cp-playlist")
+(require 'cp-hindi)
+(require 'cp-parens)
 
-(require 'keyfreq)
-(keyfreq-mode 1)
-(keyfreq-autosave-mode 1)
+(use-package keyfreq
+  :init
+  (keyfreq-mode 1)
+  (keyfreq-autosave-mode 1))
 ;; ;; disabled on 2017-08-18T19:39:21+0530, no longer interested
 ;; (open-dribble-file (concat "~/.emacs.d/keylogs/"
 ;;                            (format-time-string "%Y%m%d-%H%M%S")