diff --git a/.config/emacs/private/conlanging b/.config/emacs/private/conlanging
deleted file mode 120000
index fc84c55..0000000
--- a/.config/emacs/private/conlanging
+++ /dev/null
@@ -1 +0,0 @@
-/home/phundrak/fromGIT/Emacs-stuff/conlanging/
\ No newline at end of file
diff --git a/.config/emacs/private/conlanging b/.config/emacs/private/conlanging
new file mode 160000
index 0000000..557725a
--- /dev/null
+++ b/.config/emacs/private/conlanging
@@ -0,0 +1 @@
+Subproject commit 557725ac748d5840c7bbf1d0ff7acfd2283e692a
diff --git a/.config/emacs/private/dired-phundrak b/.config/emacs/private/dired-phundrak
deleted file mode 120000
index 1422b6f..0000000
--- a/.config/emacs/private/dired-phundrak
+++ /dev/null
@@ -1 +0,0 @@
-/home/phundrak/fromGIT/Emacs-stuff/dired-phundrak/
\ No newline at end of file
diff --git a/.config/emacs/private/dired-phundrak b/.config/emacs/private/dired-phundrak
new file mode 160000
index 0000000..34d4a4d
--- /dev/null
+++ b/.config/emacs/private/dired-phundrak
@@ -0,0 +1 @@
+Subproject commit 34d4a4d2029af1e1f6cc8d428d1d98ac528b5caf
diff --git a/.config/emacs/private/w3m b/.config/emacs/private/w3m
deleted file mode 120000
index 34d43af..0000000
--- a/.config/emacs/private/w3m
+++ /dev/null
@@ -1 +0,0 @@
-/home/phundrak/fromGIT/Emacs-stuff/w3m/
\ No newline at end of file
diff --git a/.config/emacs/private/w3m b/.config/emacs/private/w3m
new file mode 160000
index 0000000..df38ad9
--- /dev/null
+++ b/.config/emacs/private/w3m
@@ -0,0 +1 @@
+Subproject commit df38ad925491e57bfc8db1bcde2fb032c5d2e35c
diff --git a/.gitmodules b/.gitmodules
index 81f947a..3e3fda8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,18 @@
 [submodule "tmux"]
 	path = .config/tmux
 	url = https://github.com/gpakosz/.tmux.git
-[submodule "fromGIT/Emacs-stuff/conlanging"]
-	path = fromGIT/Emacs-stuff/conlanging
+[submodule "conlang-layer"]
+	path = .config/emacs/private/conlanging
 	url = git@labs.phundrak.com:phundrak/conlang-layer.git
-[submodule ".config/nanorc/nano-syntax"]
+[submodule "nano-syntax"]
 	path = .config/nanorc/nano-syntax
 	url = https://github.com/scopatz/nanorc.git
-[submodule "fromGIT/Emacs-stuff/w3m"]
-	path = fromGIT/Emacs-stuff/w3m
+[submodule "w3m-layer"]
+	path = .config/emacs/private/w3m
 	url = https://github.com/venmos/w3m-layer.git
-[submodule "fromGIT/Emacs-stuff/dired-phundrak"]
-	path = fromGIT/Emacs-stuff/dired-phundrak
+[submodule "dired-phundrak"]
+	path = .config/emacs/private/dired-phundrak
 	url = git@labs.phundrak.com:phundrak/dired-phundrak.git
+[submodule "Spacemacs"]
+	path = .config/emacs
+	url = https://github.com/syl20bnr/spacemacs
diff --git a/fromGIT/Emacs-stuff/conlanging b/fromGIT/Emacs-stuff/conlanging
deleted file mode 160000
index 557725a..0000000
--- a/fromGIT/Emacs-stuff/conlanging
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 557725ac748d5840c7bbf1d0ff7acfd2283e692a
diff --git a/fromGIT/Emacs-stuff/dired-phundrak b/fromGIT/Emacs-stuff/dired-phundrak
deleted file mode 160000
index 34d4a4d..0000000
--- a/fromGIT/Emacs-stuff/dired-phundrak
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 34d4a4d2029af1e1f6cc8d428d1d98ac528b5caf
diff --git a/fromGIT/Emacs-stuff/w3m b/fromGIT/Emacs-stuff/w3m
deleted file mode 160000
index df38ad9..0000000
--- a/fromGIT/Emacs-stuff/w3m
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit df38ad925491e57bfc8db1bcde2fb032c5d2e35c