diff --git a/.config/emacs/private/conlanging b/.config/emacs/private/conlanging
new file mode 120000
index 0000000..fc84c55
--- /dev/null
+++ b/.config/emacs/private/conlanging
@@ -0,0 +1 @@
+/home/phundrak/fromGIT/Emacs-stuff/conlanging/
\ No newline at end of file
diff --git a/.config/emacs/private/dired-phundrak b/.config/emacs/private/dired-phundrak
new file mode 120000
index 0000000..1422b6f
--- /dev/null
+++ b/.config/emacs/private/dired-phundrak
@@ -0,0 +1 @@
+/home/phundrak/fromGIT/Emacs-stuff/dired-phundrak/
\ No newline at end of file
diff --git a/.config/emacs/private/w3m b/.config/emacs/private/w3m
new file mode 120000
index 0000000..34d43af
--- /dev/null
+++ b/.config/emacs/private/w3m
@@ -0,0 +1 @@
+/home/phundrak/fromGIT/Emacs-stuff/w3m/
\ No newline at end of file
diff --git a/.config/nanorc b/.config/nanorc
deleted file mode 160000
index aa46e20..0000000
--- a/.config/nanorc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aa46e20170bad889b01bf6de1f689a4eeffbeb03
diff --git a/.config/nanorc/nano-syntax b/.config/nanorc/nano-syntax
new file mode 160000
index 0000000..195b8b2
--- /dev/null
+++ b/.config/nanorc/nano-syntax
@@ -0,0 +1 @@
+Subproject commit 195b8b21ec0cbca172f4e99d0ff23c4e4ce5349e
diff --git a/.config/tmux b/.config/tmux
new file mode 160000
index 0000000..f4fc273
--- /dev/null
+++ b/.config/tmux
@@ -0,0 +1 @@
+Subproject commit f4fc2730cf1a2ae26ebf3707548945a73cd74ff1
diff --git a/.emacs.d/private/eshell-alias b/.emacs.d/private/eshell-alias
deleted file mode 100644
index b7681f0..0000000
--- a/.emacs.d/private/eshell-alias
+++ /dev/null
@@ -1,24 +0,0 @@
-alias S sudo systemctl $*
-alias cdebug cmake -DCMAKE_BUILD_TYPE=Debug $*
-alias chgrp chgrp --preserve-root $*
-alias chmod chmod --preserve-root $*
-alias chown chown --preserve-root $*
-alias clang clang -Wall $*
-alias clang++ clang++ -Wall $*
-alias crelease cmake -DCMAKE_BUILD_TYPE=Release $*
-alias du du -ch
-alias flac youtube-dl -x --audio-format flac --audio-quality 0
-alias g++ g++ -Wall -std=c++17 $*
-alias gcc gcc -Wall -std=c11 $*
-alias grep grep --color=auto $*
-alias lns ln -si $*
-alias mp3 youtube-dl -x --audio-format flac --audio-quality 0 $*
-alias nmcli nmcli -p -c auto $*
-alias rm rm -I $*
-alias rmd rm --preserve-root -Ir $*
-alias rmdf rm --preserve-root -Irf $*
-alias rmf rm --preserve-root -If $*
-alias search pacman -Ss $*
-alias untar tar -xvzf $*
-alias update sudo pacman -Syu
-alias wget wget -c $*
diff --git a/.emacs.d/private/snippets/org-mode/attr_html b/.emacs.d/private/snippets/org-mode/attr_html
deleted file mode 100644
index 4731c7b..0000000
--- a/.emacs.d/private/snippets/org-mode/attr_html
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: ATTR HTML
-# key: <ah
-# --
-#+ATTR_HTML: $0
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/attr_latex b/.emacs.d/private/snippets/org-mode/attr_latex
deleted file mode 100644
index b92a935..0000000
--- a/.emacs.d/private/snippets/org-mode/attr_latex
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: ATTR LATEX
-# key: <al
-# --
-#+ATTR_LATEX: $0
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/caption b/.emacs.d/private/snippets/org-mode/caption
deleted file mode 100644
index 4f4e3c0..0000000
--- a/.emacs.d/private/snippets/org-mode/caption
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: caption
-# key: <ca
-# --
-#+CAPTION: $0
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/comment_block b/.emacs.d/private/snippets/org-mode/comment_block
deleted file mode 100644
index f0e112c..0000000
--- a/.emacs.d/private/snippets/org-mode/comment_block
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: comment block
-# key: <co
-# --
-#+BEGIN_COMMENT
-$0
-#+END_COMMENT
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/emacs-lisp b/.emacs.d/private/snippets/org-mode/emacs-lisp
deleted file mode 100644
index d7fef29..0000000
--- a/.emacs.d/private/snippets/org-mode/emacs-lisp
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: emacs-lisp block
-# key: <el
-# --
-#+BEGIN_SRC emacs-lisp
-$0
-#+END_SRC
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/name b/.emacs.d/private/snippets/org-mode/name
deleted file mode 100644
index 583bce6..0000000
--- a/.emacs.d/private/snippets/org-mode/name
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: name
-# key: <na
-# --
-#+NAME: $0
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/nyqy b/.emacs.d/private/snippets/org-mode/nyqy
deleted file mode 100644
index 1aa730c..0000000
--- a/.emacs.d/private/snippets/org-mode/nyqy
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# -*- mode: snippet -*-
-# name: nyqy
-# key: <ny
-# --
-\{\{\{nyqy($1)\}\}\}$0
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/phon b/.emacs.d/private/snippets/org-mode/phon
deleted file mode 100644
index 772c684..0000000
--- a/.emacs.d/private/snippets/org-mode/phon
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: phon
-# key: <ph
-# --
-\{\{\{phon($1)\}\}\}$0
\ No newline at end of file
diff --git a/.emacs.d/private/snippets/org-mode/python b/.emacs.d/private/snippets/org-mode/python
deleted file mode 100644
index 5858620..0000000
--- a/.emacs.d/private/snippets/org-mode/python
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: python block
-# key: <py
-# --
-#+NAME: $1
-#+BEGIN_SRC python
-$0
-#+END_SRC
diff --git a/.emacs.d/private/snippets/org-mode/src b/.emacs.d/private/snippets/org-mode/src
deleted file mode 100644
index 37fdf26..0000000
--- a/.emacs.d/private/snippets/org-mode/src
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: source block
-# key: <s
-# --
-#+BEGIN_SRC $0
-
-#+END_SRC
\ No newline at end of file
diff --git a/.gitconfig b/.gitconfig
index 4220a69..b889ad0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -52,6 +52,12 @@
 	rmrf = rm -r -f
 	####
 	s = status
+	sm = submodule
+	sms = submodule status
+	sma = submodule add
+	smu = submodule update
+	smui = submodule update --init
+	smuir = submodule update --init --recursive
 	####
 	staged = diff --cached
 	####
diff --git a/.gitmodules b/.gitmodules
index dd22d93..81f947a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,15 @@
 [submodule "tmux"]
-	path = tmux
+	path = .config/tmux
 	url = https://github.com/gpakosz/.tmux.git
-[submodule "spacemacs"]
-	path = .emacs.d
-	url = https://github.com/syl20bnr/spacemacs
-[submodule "conlanging"]
-	path = .emacs.d/private/conlanging
+[submodule "fromGIT/Emacs-stuff/conlanging"]
+	path = fromGIT/Emacs-stuff/conlanging
 	url = git@labs.phundrak.com:phundrak/conlang-layer.git
-[submodule "w3m"]
-	path = .emacs.d/private/w3m
-	url = https://github.com/venmos/w3m-layer.git
-[submodule "dired-phundrak"]
-	path = .emacs.d/private/dired-phundrak
-	url = git@labs.phundrak.com:phundrak/dired-phundrak.git
-[submodule "nanorc"]
-	path = .config/nanorc
+[submodule ".config/nanorc/nano-syntax"]
+	path = .config/nanorc/nano-syntax
 	url = https://github.com/scopatz/nanorc.git
+[submodule "fromGIT/Emacs-stuff/w3m"]
+	path = fromGIT/Emacs-stuff/w3m
+	url = https://github.com/venmos/w3m-layer.git
+[submodule "fromGIT/Emacs-stuff/dired-phundrak"]
+	path = fromGIT/Emacs-stuff/dired-phundrak
+	url = git@labs.phundrak.com:phundrak/dired-phundrak.git
diff --git a/.emacs.d/private/conlanging b/fromGIT/Emacs-stuff/conlanging
similarity index 100%
rename from .emacs.d/private/conlanging
rename to fromGIT/Emacs-stuff/conlanging
diff --git a/.emacs.d/private/dired-phundrak b/fromGIT/Emacs-stuff/dired-phundrak
similarity index 100%
rename from .emacs.d/private/dired-phundrak
rename to fromGIT/Emacs-stuff/dired-phundrak
diff --git a/.emacs.d/private/w3m b/fromGIT/Emacs-stuff/w3m
similarity index 100%
rename from .emacs.d/private/w3m
rename to fromGIT/Emacs-stuff/w3m
diff --git a/tmux b/tmux
deleted file mode 160000
index 01c91ba..0000000
--- a/tmux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 01c91ba5231eb2e7b32cc2f47ac9022efae87962