diff --git a/.gitignore b/.gitignore
index 19beed5..c3872c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,4 +53,5 @@ projectile-bookmarks.eld
 emms
 transient
 .cache
-auto-save/
\ No newline at end of file
+auto-save/.DS_Store
+.DS_Store
diff --git a/emacs/.emacs.d/custom.el b/emacs/.emacs.d/custom.el
index 96b9f22..cd77eee 100644
--- a/emacs/.emacs.d/custom.el
+++ b/emacs/.emacs.d/custom.el
@@ -4,7 +4,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(treemacs-evil visual-fill-column org-bullets treemacs-icons-dired treemacs-projectile treemacs-all-the-icons treemacs emms evil-collection evil magit counsel-projectile projectile markdown-mode which-key rainbow-delimiters doom-modeline doom-themes all-the-icons ivy)))
+   '(treemacs-magit treemacs-evil visual-fill-column org-bullets treemacs-icons-dired treemacs-projectile treemacs-all-the-icons treemacs emms evil-collection evil magit counsel-projectile projectile markdown-mode which-key rainbow-delimiters doom-modeline doom-themes all-the-icons ivy)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 3429412..b6fc334 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1,21 +1,15 @@
-;;backup files
+;; -*- lexical-binding: t; -*-
 
-(setq inhibit-startup-message t) 
-(setq initial-scratch-message nil)
+;; Personal modules
+(add-to-list 'load-path '"~/.dotfiles/emacs/.emacs.d/modules")
 
-(menu-bar-mode -1)  
-(tool-bar-mode -1) 
-(set-fringe-mode 10)
-(scroll-bar-mode -1)
-
-(setq auto-save-file-name-transforms
-          `((".*" ,(concat user-emacs-directory "auto-save/") t)))
-(setq backup-directory-alist '(("" . "~/.emacs.d/emacs-backup")))
 (setq vc-follow-symlinks t)
 
 ;; Slightly nicer theme
 (set-face-attribute 'default nil :font "Menlo" :height 130)
 
+(require 'jg-core)
+
 (setq custom-file (concat user-emacs-directory "custom.el"))
 (when (file-exists-p custom-file)
   (load custom-file))
@@ -238,6 +232,9 @@
 (use-package treemacs-evil
   :after (treemacs evil))
 
+(use-package treemacs-magit
+  :after (treemacs magit))
+
 (use-package treemacs-icons-dired
   :hook (dired-mode . treemacs-icons-dired-enable-once)
   :after (treemacs))
diff --git a/emacs/.emacs.d/modules/jg-core.el b/emacs/.emacs.d/modules/jg-core.el
new file mode 100644
index 0000000..b7a38f8
--- /dev/null
+++ b/emacs/.emacs.d/modules/jg-core.el
@@ -0,0 +1,22 @@
+;; -*- lexical-binding: t; -*-
+
+(setq inhibit-startup-message t) 
+(setq initial-scratch-message nil)
+
+;; Disable menu, tool and scroll bars
+(menu-bar-mode -1)  
+(tool-bar-mode -1) 
+(scroll-bar-mode -1)
+
+;; Add small window fringes
+(set-fringe-mode 10)
+
+;; Management of basic paths and caches
+(setq user-emacs-directory (expand-file-name "~/.cache/emacs/")
+      url-history-file (expand-file-name "url/history" user-emacs-directory))
+
+(setq auto-save-file-name-transforms
+          `((".*" ,(concat user-emacs-directory "auto-save/") t)))
+(setq backup-directory-alist '(("" . "~/.emacs.d/emacs-backup")))
+
+(provide 'jg-core)