diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index b6fc334..ead325e 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -8,27 +8,13 @@
 ;; Slightly nicer theme
 (set-face-attribute 'default nil :font "Menlo" :height 130)
 
+(require 'jg-package)
 (require 'jg-core)
 
 (setq custom-file (concat user-emacs-directory "custom.el"))
 (when (file-exists-p custom-file)
   (load custom-file))
 
-;; Set up package repos
-(require 'package)
-(setq package-archives '(("melpa" . "https://melpa.org/packages/")
-                         ("org" . "https://orgmode.org/elpa/")
-                         ("elpa" . "https://elpa.gnu.org/packages/")))
-(package-initialize)
-(unless package-archive-contents
-  (package-refresh-contents))
-(unless (package-installed-p 'use-package)
-  (package-install 'use-package))
-
-;; Set up use-package
-(require 'use-package)
-(setq use-package-always-ensure t)
-
 (use-package ivy
   :diminish
   :config
@@ -103,7 +89,7 @@
   (setq evil-want-keybinding nil)
   (setq evil-want-C-u-scroll t)
   (setq evil-want-C-i-jump nil)
-  :hook (evil-mode . rune/evil-hook)
+;;  :hook (evil-mode . rune/evil-hook)
   :config
   (evil-mode 1)
   (define-key evil-insert-state-map (kbd "C-g") 'evil-normal-state)
diff --git a/emacs/.emacs.d/modules/jg-core.el b/emacs/.emacs.d/modules/jg-core.el
index b7a38f8..8fba0d4 100644
--- a/emacs/.emacs.d/modules/jg-core.el
+++ b/emacs/.emacs.d/modules/jg-core.el
@@ -1,4 +1,4 @@
-;; -*- lexical-binding: t; -*-
+; -*- lexical-binding: t; -*-
 
 (setq inhibit-startup-message t) 
 (setq initial-scratch-message nil)
diff --git a/emacs/.emacs.d/modules/jg-package.el b/emacs/.emacs.d/modules/jg-package.el
new file mode 100644
index 0000000..aea170b
--- /dev/null
+++ b/emacs/.emacs.d/modules/jg-package.el
@@ -0,0 +1,18 @@
+; -*- lexical-binding: t; -*-
+
+(require 'package)
+
+(setq package-archives '(("melpa" . "https://melpa.org/packages/")
+                         ("org" . "https://orgmode.org/elpa/")
+                         ("elpa" . "https://elpa.gnu.org/packages/")    ))
+
+(package-initialize)
+(unless package-archive-contents
+  (package-refresh-contents))
+(unless (package-installed-p 'use-package)
+  (package-install 'use-package))
+
+(require 'use-package)
+(setq use-package-always-ensure t)
+
+(provide 'jg-package)