diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8566567
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "shFlags"]
+	path = shFlags
+	url = git://github.com/nvie/shFlags.git
diff --git a/.vimrc b/etc/.vimrc
similarity index 100%
rename from .vimrc
rename to etc/.vimrc
diff --git a/git-now.el b/etc/git-now.el
similarity index 100%
rename from git-now.el
rename to etc/git-now.el
diff --git a/update b/git-now-update
similarity index 100%
rename from update
rename to git-now-update
diff --git a/shFlags b/shFlags
new file mode 160000
index 0000000..2fb06af
--- /dev/null
+++ b/shFlags
@@ -0,0 +1 @@
+Subproject commit 2fb06af13de884e9680f14a00c82e52a67c867f1