diff --git a/emacs b/emacs/.emacs
similarity index 100%
rename from emacs
rename to emacs/.emacs
diff --git a/emacs.d/lisp/haml-mode.el b/emacs/.emacs.d/lisp/haml-mode.el
similarity index 100%
rename from emacs.d/lisp/haml-mode.el
rename to emacs/.emacs.d/lisp/haml-mode.el
diff --git a/emacs.d/lisp/markdown-mode.el b/emacs/.emacs.d/lisp/markdown-mode.el
similarity index 100%
rename from emacs.d/lisp/markdown-mode.el
rename to emacs/.emacs.d/lisp/markdown-mode.el
diff --git a/emacs.d/lisp/slim-mode.el b/emacs/.emacs.d/lisp/slim-mode.el
similarity index 100%
rename from emacs.d/lisp/slim-mode.el
rename to emacs/.emacs.d/lisp/slim-mode.el
diff --git a/emacs.d/lisp/yaml-mode.el b/emacs/.emacs.d/lisp/yaml-mode.el
similarity index 100%
rename from emacs.d/lisp/yaml-mode.el
rename to emacs/.emacs.d/lisp/yaml-mode.el
diff --git a/gitconfig b/git/.gitconfig
similarity index 62%
rename from gitconfig
rename to git/.gitconfig
index c52c3d6..c21146d 100644
--- a/gitconfig
+++ b/git/.gitconfig
@@ -1,10 +1,12 @@
 [user]
-    name = Anna Wiggins
+	name = Anna Wiggins
     email = annabunches@gmail.com
 	signingkey = EFEF6022
-[push]
-	default = simple
 [commit]
 	gpgsign = true
 [gpg]
 	program = gpg2
+[push]
+	default = simple
+[alias]
+    graph = log --graph --oneline --decorate --all
diff --git a/git/gitconfig b/git/gitconfig
deleted file mode 100644
index 144ad66..0000000
--- a/git/gitconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is Git's per-user configuration file.
-[user]
-# Please adapt and uncomment the following lines:
-	name = Anna Wiggins
-        email = annabunches@gmail.com
-	signingkey = 0448ED78
-[commit]
-	gpgsign = true
-[gpg]
-	program = gpg2
-[push]
-	default = upstream
-[alias]
-    graph = log --graph --oneline --decorate --all