diff --git a/layers/+lang/elm/packages-config.el b/layers/+lang/elm/packages-config.el
new file mode 100644
index 000000000..535a465ab
--- /dev/null
+++ b/layers/+lang/elm/packages-config.el
@@ -0,0 +1,98 @@
+;;; packages-config.el --- Elm Layer packages configuration File for Spacemacs
+;;
+;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
+;;
+;; Author: Sylvain Benner <sylvain.benner@gmail.com>
+;; URL: https://github.com/syl20bnr/spacemacs
+;;
+;; This file is not part of GNU Emacs.
+;;
+;;; License: GPLv3
+
+(defun elm/post-init-company ()
+  (spacemacs|add-company-hook elm-mode)
+  (add-hook 'elm-mode-hook 'elm-oracle-setup-completion))
+
+(defun elm/post-init-flycheck ()
+  (add-hook 'elm-mode-hook 'flycheck-mode)
+  (add-hook 'elm-mode-hook 'spacemacs//elm-find-root))
+
+(when (configuration-layer/layer-usedp 'syntax-checking)
+  (defun elm/init-flycheck-elm ()
+    "Initialize flycheck-elm"
+    (use-package flycheck-elm
+      :if (configuration-layer/package-usedp 'flycheck)
+      :defer t
+      :init (add-hook 'flycheck-mode-hook 'flycheck-elm-setup t))))
+
+(defun elm/init-elm-mode ()
+  "Initialize elm-mode"
+  (use-package elm-mode
+    :mode ("\\.elm\\'" . elm-mode)
+    :init
+    (progn
+      (spacemacs/register-repl 'elm-mode 'elm-repl-load "elm")
+
+      (defun spacemacs/init-elm-mode ()
+        "Disable electric-indent-mode and let indentation cycling feature work"
+        (if (fboundp 'electric-indent-local-mode)
+            (electric-indent-local-mode -1)))
+
+      (add-hook 'elm-mode-hook 'spacemacs/init-elm-mode))
+    :config
+    (progn
+      (push "\\*elm\\*" spacemacs-useful-buffers-regexp)
+
+      (spacemacs/set-leader-keys-for-major-mode 'elm-mode
+        ;; make
+        "cb" 'elm-compile-buffer
+        "cB" 'spacemacs/elm-compile-buffer-output
+        "cm" 'elm-compile-main
+
+        ;; oracle
+        "ht" 'elm-oracle-type-at-point
+
+        ;; repl
+        "'"  'elm-repl-load
+        "si" 'elm-repl-load
+        "sf" 'elm-repl-push-decl
+        "sF" 'spacemacs/elm-repl-push-decl-focus
+        "sr" 'elm-repl-push
+        "sR" 'spacemacs/elm-repl-push-focus
+
+        ;; reactor
+        "Rn" 'elm-preview-buffer
+        "Rm" 'elm-preview-main
+
+        ;; package
+        "pi" 'elm-import
+        "pc" 'elm-package-catalog
+        "pd" 'elm-documentation-lookup)
+
+      (dolist (x '(("mR" . "reactor")
+                   ("mc" . "compile")
+                   ("mh" . "help")
+                   ("mp" . "package")
+                   ("ms" . "repl")))
+        (spacemacs/declare-prefix-for-mode 'elm-mode (car x) (cdr x)))
+
+      (evilified-state-evilify elm-package-mode elm-package-mode-map
+        "g" 'elm-package-refresh
+        "n" 'elm-package-next
+        "p" 'elm-package-prev
+        "v" 'elm-package-view
+        "m" 'elm-package-mark
+        "u" 'elm-package-unmark
+        "x" 'elm-package-install
+        "q" 'quit-window))))
+
+(defun elm/pre-init-popwin ()
+  (spacemacs|use-package-add-hook popwin
+    :post-config
+    (push '("*elm*" :tail t :noselect t) popwin:special-display-config)
+    (push '("*elm-make*" :tail t :noselect t) popwin:special-display-config)))
+
+(defun elm/post-init-smartparens ()
+  (if dotspacemacs-smartparens-strict-mode
+      (add-hook 'elm-mode-hook #'smartparens-strict-mode)
+    (add-hook 'elm-mode-hook #'smartparens-mode)))
diff --git a/layers/+lang/elm/packages-funcs.el b/layers/+lang/elm/packages-funcs.el
new file mode 100644
index 000000000..b7f4c20f8
--- /dev/null
+++ b/layers/+lang/elm/packages-funcs.el
@@ -0,0 +1,39 @@
+;;; packages-funcs.el --- Elm Layer packages functions File for Spacemacs
+;;
+;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
+;;
+;; Author: Sylvain Benner <sylvain.benner@gmail.com>
+;; URL: https://github.com/syl20bnr/spacemacs
+;;
+;; This file is not part of GNU Emacs.
+;;
+;;; License: GPLv3
+
+
+
+(when (configuration-layer/package-usedp 'elm-mode)
+
+  (defun spacemacs//elm-find-root ()
+    (setq default-directory (elm--find-dependency-file-path))))
+
+
+
+(when (configuration-layer/package-usedp 'elm-mode)
+
+  (defun spacemacs/elm-compile-buffer-output ()
+    (interactive)
+    (let* ((fname (format "%s.js" (downcase (file-name-base (buffer-file-name))))))
+      (elm-compile--file (elm--buffer-local-file-name) fname)))
+
+  (defun spacemacs/elm-repl-push-decl-focus ()
+    "Send current function to the REPL and focus it in insert state."
+    (interactive)
+    (elm-repl-push-decl)
+    (run-elm-interactive)
+    (evil-insert-state))
+
+  (defun spacemacs/elm-repl-push-focus ()
+    "Send current region to the REPL and focus it in insert state."
+    (elm-repl-push)
+    (run-elm-interactive)
+    (evil-insert-state)))
diff --git a/layers/+lang/elm/packages.el b/layers/+lang/elm/packages.el
index 71e08717f..457765c4f 100644
--- a/layers/+lang/elm/packages.el
+++ b/layers/+lang/elm/packages.el
@@ -19,111 +19,3 @@
       smartparens
       ))
 
-(defun elm/post-init-company ()
-  (spacemacs|add-company-hook elm-mode)
-  (add-hook 'elm-mode-hook 'elm-oracle-setup-completion))
-
-(defun spacemacs//elm-find-root ()
-  (setq default-directory (elm--find-dependency-file-path)))
-
-(defun elm/post-init-flycheck ()
-  (add-hook 'elm-mode-hook 'flycheck-mode)
-  (add-hook 'elm-mode-hook '#'spacemacs//elm-find-root))
-
-(when (configuration-layer/layer-usedp 'syntax-checking)
-  (defun elm/init-flycheck-elm ()
-    "Initialize flycheck-elm"
-    (use-package flycheck-elm
-      :if (configuration-layer/package-usedp 'flycheck)
-      :defer t
-      :init (add-hook 'flycheck-mode-hook 'flycheck-elm-setup t))))
-
-(defun elm/init-elm-mode ()
-  "Initialize elm-mode"
-  (use-package elm-mode
-    :mode ("\\.elm\\'" . elm-mode)
-    :init
-    (progn
-      (spacemacs/register-repl 'elm-mode 'elm-repl-load "elm")
-
-      (defun spacemacs/init-elm-mode ()
-        "Disable electric-indent-mode and let indentation cycling feature work"
-        (if (fboundp 'electric-indent-local-mode)
-            (electric-indent-local-mode -1)))
-
-      (add-hook 'elm-mode-hook 'spacemacs/init-elm-mode))
-    :config
-    (progn
-      (push "\\*elm\\*" spacemacs-useful-buffers-regexp)
-
-      (defun spacemacs/elm-compile-buffer-output ()
-        (interactive)
-        (let* ((fname (format "%s.js" (downcase (file-name-base (buffer-file-name))))))
-          (elm-compile--file (elm--buffer-local-file-name) fname)))
-
-      (defun spacemacs/elm-repl-push-decl-focus ()
-        "Send current function to the REPL and focus it in insert state."
-        (interactive)
-        (elm-repl-push-decl)
-        (run-elm-interactive)
-        (evil-insert-state))
-
-      (defun spacemacs/elm-repl-push-focus ()
-        "Send current region to the REPL and focus it in insert state."
-        (elm-repl-push)
-        (run-elm-interactive)
-        (evil-insert-state))
-
-      (spacemacs/set-leader-keys-for-major-mode 'elm-mode
-        ;; make
-        "cb" 'elm-compile-buffer
-        "cB" 'spacemacs/elm-compile-buffer-output
-        "cm" 'elm-compile-main
-
-        ;; oracle
-        "ht" 'elm-oracle-type-at-point
-
-        ;; repl
-        "'"  'elm-repl-load
-        "si" 'elm-repl-load
-        "sf" 'elm-repl-push-decl
-        "sF" 'spacemacs/elm-repl-push-decl-focus
-        "sr" 'elm-repl-push
-        "sR" 'spacemacs/elm-repl-push-focus
-
-        ;; reactor
-        "Rn" 'elm-preview-buffer
-        "Rm" 'elm-preview-main
-
-        ;; package
-        "pi" 'elm-import
-        "pc" 'elm-package-catalog
-        "pd" 'elm-documentation-lookup)
-
-      (dolist (x '(("mR" . "reactor")
-                   ("mc" . "compile")
-                   ("mh" . "help")
-                   ("mp" . "package")
-                   ("ms" . "repl")))
-        (spacemacs/declare-prefix-for-mode 'elm-mode (car x) (cdr x)))
-
-      (evilified-state-evilify elm-package-mode elm-package-mode-map
-        "g" 'elm-package-refresh
-        "n" 'elm-package-next
-        "p" 'elm-package-prev
-        "v" 'elm-package-view
-        "m" 'elm-package-mark
-        "u" 'elm-package-unmark
-        "x" 'elm-package-install
-        "q" 'quit-window))))
-
-(defun elm/pre-init-popwin ()
-  (spacemacs|use-package-add-hook popwin
-    :post-config
-    (push '("*elm*" :tail t :noselect t) popwin:special-display-config)
-    (push '("*elm-make*" :tail t :noselect t) popwin:special-display-config)))
-
-(defun elm/post-init-smartparens ()
-  (if dotspacemacs-smartparens-strict-mode
-      (add-hook 'elm-mode-hook #'smartparens-strict-mode)
-    (add-hook 'elm-mode-hook #'smartparens-mode)))