diff --git a/README.md b/README.md
new file mode 100644
index 0000000..af552db
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+# Dotfiles
+Collection of configuration/dotfiles. Most are designed to be linked via GNU stow, for example:
+
+```
+stow --dotfile git
+```
diff --git a/agignore b/ag/dot-agignore
similarity index 100%
rename from agignore
rename to ag/dot-agignore
diff --git a/gitconfig b/git/dot-gitconfig
similarity index 85%
rename from gitconfig
rename to git/dot-gitconfig
index 07b29b6..f5aae55 100644
--- a/gitconfig
+++ b/git/dot-gitconfig
@@ -2,6 +2,9 @@
     name = Chun Li
     email = chunli.developer@gmail.com
 
+[init]
+    defaultBranch = main
+
 [alias]
     hist = log --pretty=oneline --graph --decorate --all --abbrev-commit
     diff = --ignore-space-change
@@ -37,20 +40,16 @@
     precomposeunicode = true
 
 [merge]
-    tool = Opendiff
+    tool = vimdiff
 [mergetool]
     keepBackup = false
     prompt = false
-[mergetool "Opendiff"]
-    cmd = opendiff \"$LOCAL\" \"$REMOTE\" --merge \"$MERGED\"
-    trustexitcode = true
 [diff]
-    tool = Opendiff
+    tool = vimdiff
 [pull]
     ff = only
 [push]
     default = simple
 [difftool]
     prompt = false
-[difftool "Opendiff"]
-    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+    tool = vimdiff
diff --git a/profile b/profile
deleted file mode 100644
index 68f193e..0000000
--- a/profile
+++ /dev/null
@@ -1,3 +0,0 @@
-[ -n "$PROFILE" ] && return || readonly PROFILE=1
-
-alias venv=". venv/bin/activate"
diff --git a/tmux.conf b/tmux/dot-tmux.conf
similarity index 100%
rename from tmux.conf
rename to tmux/dot-tmux.conf
diff --git a/vimrc b/vim/dot-vimrc
similarity index 100%
rename from vimrc
rename to vim/dot-vimrc
diff --git a/vimrc.bundles b/vim/dot-vimrc.bundles
similarity index 100%
rename from vimrc.bundles
rename to vim/dot-vimrc.bundles
diff --git a/zsh/dot-zprofile b/zsh/dot-zprofile
new file mode 100644
index 0000000..e69de29
diff --git a/zshrc b/zsh/dot-zshrc
similarity index 100%
rename from zshrc
rename to zsh/dot-zshrc