diff --git a/.gitignore b/.gitignore
index 2416467..27499b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/home/eeleater/dotfiles/zulu/path
-/home/eeleater/dotfiles/zulu/fpath
-/home/eeleater/dotfiles/zulu/cdpath
-/home/eeleater/dotfiles/zulu/manpath
-/home/eeleater/dotfiles/zulu/alias
+/home/eeleater/dotfiles/lib/zulu/path
+/home/eeleater/dotfiles/lib/zulu/fpath
+/home/eeleater/dotfiles/lib/zulu/cdpath
+/home/eeleater/dotfiles/lib/zulu/manpath
+/home/eeleater/dotfiles/lib/zulu/alias
diff --git a/.gitmodules b/.gitmodules
index 11d6491..52fafe6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,9 @@
 [submodule "lib/fzf"]
 	path = lib/fzf
 	url = https://github.com/junegunn/fzf.git
+[submodule "lib/zulu/core"]
+	path = lib/zulu/core
+	url = https://github.com/zulu-zsh/zulu
+[submodule "lib/zulu/index"]
+	path = lib/zulu/index
+	url = https://github.com/zulu-zsh/index
diff --git a/lib/bin/is b/bin/is
similarity index 100%
rename from lib/bin/is
rename to bin/is
diff --git a/lib/bin/nma b/bin/nma
similarity index 100%
rename from lib/bin/nma
rename to bin/nma
diff --git a/lib/bin/revolver b/bin/revolver
similarity index 100%
rename from lib/bin/revolver
rename to bin/revolver
diff --git a/lib/completions b/lib/completions
index 01c69f3..2a30b05 160000
--- a/lib/completions
+++ b/lib/completions
@@ -1 +1 @@
-Subproject commit 01c69f3ce201db8d2127cb35bdc904ce4fd0fd85
+Subproject commit 2a30b05a5cf724a2d1c4c140c302dbf93f6aa6f6
diff --git a/lib/crash b/lib/crash
deleted file mode 160000
index e5dc42d..0000000
--- a/lib/crash
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e5dc42d708c0a659db6a3100f99340b63df19c9b
diff --git a/lib/dasht b/lib/dasht
deleted file mode 160000
index 1f5b496..0000000
--- a/lib/dasht
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f5b49615c929cceda135e489480f7e53836be2b
diff --git a/lib/fzf b/lib/fzf
index 940214a..bc9d2ab 160000
--- a/lib/fzf
+++ b/lib/fzf
@@ -1 +1 @@
-Subproject commit 940214a1a2cbc64f32539e9a65beafc767f259e2
+Subproject commit bc9d2abdb67639e06f7002b278341fb498b79456
diff --git a/lib/k b/lib/k
deleted file mode 160000
index 1fa7c03..0000000
--- a/lib/k
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1fa7c039d40684d39cb225599bda4a86a62e765d
diff --git a/lib/nano/syntax b/lib/nano/syntax
index fc08bf2..43dd59a 160000
--- a/lib/nano/syntax
+++ b/lib/nano/syntax
@@ -1 +1 @@
-Subproject commit fc08bf270a1ff5eba2a24e2c7722dbe381947b87
+Subproject commit 43dd59ad3677b9e1ddd0e2b81000312fa5d7356b
diff --git a/lib/util b/lib/util
deleted file mode 160000
index 2d69cda..0000000
--- a/lib/util
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d69cda49b1f15b3026f2de0b7178f63b37b8b33
diff --git a/zulu/bin/.gitkeep b/lib/zulu/bin/.gitkeep
similarity index 100%
rename from zulu/bin/.gitkeep
rename to lib/zulu/bin/.gitkeep
diff --git a/zulu/core b/lib/zulu/core
similarity index 100%
rename from zulu/core
rename to lib/zulu/core
diff --git a/lib/zulu/index b/lib/zulu/index
new file mode 160000
index 0000000..aad6ee4
--- /dev/null
+++ b/lib/zulu/index
@@ -0,0 +1 @@
+Subproject commit aad6ee4f1c4a50964556664de6dd359dd425905c
diff --git a/zulu/init/.gitkeep b/lib/zulu/init/.gitkeep
similarity index 100%
rename from zulu/init/.gitkeep
rename to lib/zulu/init/.gitkeep
diff --git a/zulu/packages/.gitkeep b/lib/zulu/packages/.gitkeep
similarity index 100%
rename from zulu/packages/.gitkeep
rename to lib/zulu/packages/.gitkeep
diff --git a/zulu/share/.gitkeep b/lib/zulu/share/.gitkeep
similarity index 100%
rename from zulu/share/.gitkeep
rename to lib/zulu/share/.gitkeep
diff --git a/zsh/zshrc b/zsh/zshrc
index bfe54ca..d2a9432 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -4,13 +4,17 @@ export OWN=${DOT}/zsh
 export LIB=${DOT}/lib
 export OMZ=${LIB}/ohmyzsh
 export ZSH=${OMZ}
-export ZUL=${DOT}/zulu
-export ZUC=${ZUL}/config/zulu
-export PATH="${HOME}/dotfiles/lib/bin:/opt/android-sdk/build-tools/26.0.0/:${PATH}"
+export ZUL=${LIB}/zulu
+export ZUC=${ZUL}/config
+export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${PATH}"
 export EDITOR='nano'
 export TERM=linux
 fpath=(${LIB}/completions/src $fpath)
 
+# Fix MobaXterm Home/End key with ZSH
+bindkey '^[[H' beginning-of-line
+bindkey '^[[F' end-of-line
+
 # Settings & Dircolors
 ZSH_THEME="mortalscumbag"
 DISABLE_AUTO_UPDATE="true"