diff --git a/init.el b/init.el
index 9559865..35a47da 100644
--- a/init.el
+++ b/init.el
@@ -32,7 +32,6 @@
         (convert-standard-filename "lisp/")))
 
 ;; Load the code of some external files
-(require 'packages)
 (require 'interface)
 (require 'editor)
 (require 'org-mode)
diff --git a/lisp/editor.el b/lisp/editor.el
index 1587a56..6271702 100644
--- a/lisp/editor.el
+++ b/lisp/editor.el
@@ -4,8 +4,22 @@
 (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
 
 ;;; evil - A Vi Layer inside of Emacs
-(evil-collection-init) ; Enable the evil-collection keybinds
-(evil-mode 1) ; Enable evil
+(use-package evil
+  :init
+  (setq evil-want-keybinding nil ; Make room for evil-collection
+	evil-want-integration t ; Same as above
+	evil-undo-system 'undo-fu) ; Set the undo/redo system
+  :config
+  (evil-mode 1))
+
+;; evil-collection - a collection of keybindings for evil-mode
+(use-package evil-collection
+  :after evil ; In order to recognize evil-want-... being set
+  :init
+  (evil-collection-init)) ; Enable the evil-collection keybinds
+
+;; undo-fu, used by evil for undo/redo functionality
+(use-package undo-fu)
 
 ;; Disable the creation of files ending with '~' (backup files)
 (setq make-backup-files nil)
diff --git a/lisp/interface.el b/lisp/interface.el
index 50a58d2..463e748 100644
--- a/lisp/interface.el
+++ b/lisp/interface.el
@@ -20,5 +20,25 @@
   (set-face-foreground face (face-attribute 'default :background)))
 (set-face-background 'fringe (face-attribute 'default :background))
 
+;; magit - A beautiful git porcelain for Emacs
+(use-package magit)
+
+;; which-key - a popup which displays available keybindings
+(use-package which-key)
+
+;;; Themes
+;; Install the Doom Emacs theme megapack.
+(use-package doom-themes)
+  
+;; kaolin-themes, depends on autothemer
+(use-package kaolin-themes
+  :requires autothemer)
+
+;; autothemer - conveniently create Emacs themes
+(use-package autothemer)
+
+;; all-the-icons - Icons for various UI elements
+(use-package all-the-icons)
+
 ;; Provide this file to init.el
 (provide 'interface)
diff --git a/lisp/org-mode.el b/lisp/org-mode.el
index 3fd57f9..dc21d9a 100644
--- a/lisp/org-mode.el
+++ b/lisp/org-mode.el
@@ -1,5 +1,13 @@
 ;;; This file contains configuration for Emacs' org-mode
 
+;;; org-mode
+;; org-superstar
+(use-package org-superstar
+  :config
+  ;; Change org-mode's heading bullets
+  (setq org-superstar-headline-bullets-list
+	'("🞉" "🞈" "🞇" "🞆" "🞅" "🞄")))
+
 ;; Customize org-mode's default functionality
 (setq org-ellipsis "..."
       org-use-property-inheritance t
@@ -13,10 +21,6 @@
       org-hide-leading-stars t
       org-adapt-indentation t)
 
-;; Change org-mode's heading bullets
-(setq org-superstar-headline-bullets-list
-      '("🞉" "🞈" "🞇" "🞆" "🞅" "🞄"))
-
 ;; Faces for the font sizes of org-mode headings
 (set-face-attribute 'org-level-8 nil :weight 'bold :inherit 'default)
 (set-face-attribute 'org-level-7 nil :inherit 'org-level-8)
diff --git a/lisp/packages.el b/lisp/packages.el
deleted file mode 100644
index 31f21be..0000000
--- a/lisp/packages.el
+++ /dev/null
@@ -1,41 +0,0 @@
-;;; This file contains the packages that Dianciemacs uses
-
-;; magit - A beautiful git porcelain for Emacs
-(use-package magit)
-
-;;; Themes
-;; Install the Doom Emacs theme megapack.
-(use-package doom-themes)
-  
-;; kaolin-themes, depends on autothemer
-(use-package kaolin-themes
-  :requires autothemer)
-
-(use-package autothemer)
-
-;; all-the-icons - Icons for various UI elements
-(use-package all-the-icons)
-
-;;; org-mode
-;; org-superstar
-(use-package org-superstar)
-
-;;; evil - A Vi layer inside of Emacs
-(use-package evil
-  :init
-  (setq evil-want-keybinding nil ; Make room for evil-collection
-	evil-want-integration t ; Same as above
-	evil-undo-system 'undo-fu)) ; Set the undo/redo system
-
-;; A collection of keybinds for evil-mode
-(use-package evil-collection
-  :after evil) ; In order to recognize evil-want-... being set
-
-;; undo-fu, used by evil for undo/redo functionality
-(use-package undo-fu)
-
-;;; Keybinds
-(use-package which-key)
-
-;; Provide this file to init.el
-(provide 'packages)