diff --git a/.stow-rename b/.stow-rename
new file mode 100644
index 0000000..51f56dd
--- /dev/null
+++ b/.stow-rename
@@ -0,0 +1,2 @@
+config => .config
+local => .local
diff --git a/dot-config/zsh/functions/_dots b/config/zsh/functions/_dots
similarity index 100%
rename from dot-config/zsh/functions/_dots
rename to config/zsh/functions/_dots
diff --git a/dot-local/bin/dots b/local/bin/dots
similarity index 86%
rename from dot-local/bin/dots
rename to local/bin/dots
index 7652990..4dd5b4d 100755
--- a/dot-local/bin/dots
+++ b/local/bin/dots
@@ -5,7 +5,6 @@
 global_ignore=(
 	'\.git.*'
 	'README\.md'
-	'\.editorconfig'
 	'\.stow-no-folding'
 	'\.stow-rename'
 	'\.mypy_cache'
@@ -16,28 +15,16 @@ bootstrap() {
 	echo 'Bootstrapping your dotfiles...' >&2
 	mkdir -p $DOTFILES
 	touch $DOTFILES/.stow
-	if (( $+commands[stow] )); then
-		local stow_version=${"$(stow -V)"#stow*version }
-		if [[ $stow_version != 2.3.2-fixbug56727 ]]; then
-			echo "GNU Stow is installed, but version $stow_version is bugged." >&2
-			echo 'See https://github.com/aspiers/stow/issues/33 for info.' >&2
-			echo 'Will fetch patched version of Stow...' >&2
-			install-custom-gnu-stow || return $?
-		fi
-	else
+	if (( ! $+commands[stow] )); then
 		echo 'GNU Stow is not installed, fetching it...' >&2
-		install-custom-gnu-stow || return $?
+		clone-one stow || return $?
+		STOW=$DOTFILES/stow/local/bin/stow
 	fi
 
 	clone dots git vim zsh || return $?
 	link
 }
 
-install-custom-gnu-stow() {
-	clone-one stow || return $?
-	STOW=$DOTFILES/stow/dot-local/bin/stow
-}
-
 clone() {
 	echo "Requested packages: $argv" >&2
 	for package in $argv; do
@@ -76,7 +63,7 @@ link() {
 
 	for nofold in $DOTFILES/${^packages}/.stow-no-folding(N); process-stow-no-folding $nofold
 
-	$STOW --dotfiles -d $DOTFILES -t ~ --ignore=${^global_ignore} $packages
+	$STOW -d $DOTFILES -t ~ --ignore=${^global_ignore} $packages
 }
 
 process-stow-no-folding() {