diff --git a/.doom.d/aliases b/.config/doom/aliases
similarity index 100%
rename from .doom.d/aliases
rename to .config/doom/aliases
diff --git a/.doom.d/config.el b/.config/doom/config.el
similarity index 100%
rename from .doom.d/config.el
rename to .config/doom/config.el
diff --git a/.doom.d/config.org b/.config/doom/config.org
similarity index 96%
rename from .doom.d/config.org
rename to .config/doom/config.org
index b8a1aee..4cf5271 100644
--- a/.doom.d/config.org
+++ b/.config/doom/config.org
@@ -151,40 +151,14 @@ An RSS newsfeed reader for Emacs.
 #+END_SRC
 
 * EMMS
-One of the media players available for Emacs is emms, which stands for Emacs Multimedia System.  By default, Doom Emacs does not use 'SPC a',' so the format I use for these bindings is 'SPC a' plus 'key'.
-
-| COMMAND               | DESCRIPTION                       | KEYBINDING |
-|-----------------------+-----------------------------------+------------|
-| emms-playlist-mode-go | /Switch to the playlist buffer/     | SPC a a    |
-| emms-pause            | /Pause the track/                   | SPC a x    |
-| emms-stop             | /Stop the track/                    | SPC a s    |
-| emms-previous         | /Play previous track in playlist/   | SPC a p    |
-| emms-next             | /Play next track in playlist/       | SPC a n    |
-
+EMMS is now a default module in doom, so you only have to pass in your music folder.
 #+BEGIN_SRC emacs-lisp
-(emms-all)
-(emms-default-players)
 (emms-mode-line 1)
 (emms-playing-time 1)
 (setq emms-source-file-default-directory "~/Music/Non-Classical/70s-80s/"
       emms-playlist-buffer-name "*Music*"
       emms-info-asynchronously t
       emms-source-file-directory-tree-function 'emms-source-file-directory-tree-find)
-(map! :leader
-      :desc "Go to emms playlist"
-      "a a" #'emms-playlist-mode-go
-      :leader
-      :desc "Emms pause track"
-      "a x" #'emms-pause
-      :leader
-      :desc "Emms stop track"
-      "a s" #'emms-stop
-      :leader
-      :desc "Emms play previous track"
-      "a p" #'emms-previous
-      :leader
-      :desc "Emms play next track"
-      "a n" #'emms-next)
 #+END_SRC
 
 * EVALUATE ELISP EXPRESSIONS
diff --git a/.doom.d/init.el b/.config/doom/init.el
similarity index 100%
rename from .doom.d/init.el
rename to .config/doom/init.el
diff --git a/.doom.d/packages.el b/.config/doom/packages.el
similarity index 100%
rename from .doom.d/packages.el
rename to .config/doom/packages.el