diff --git a/.gitignore b/.gitignore
index bab403c..b425911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,13 @@ tmp
 *.deb
 *.log
 
+**/plugged
+**/autoload
+**/functions
+**/completions
+**/conf.d
+**/fish_variables
+
 # pytest
 **/__pycache__
 **/.pytest_cache
diff --git a/bootstrap.pl b/bootstrap.pl
index 649887f..3c6c823 100755
--- a/bootstrap.pl
+++ b/bootstrap.pl
@@ -9,11 +9,14 @@ use Stow;
 
 # Stow files
 my $dir = getcwd;
-my %stow_options = (
-	dir => "$dir/files",
-	target => "$ENV{'HOME'}"
-);
+my %stow_options = ( dir => $dir,
+	             target => $ENV{'HOME'});
 my $stow = new Stow(%stow_options);
-my %conflicts = $stow->get_conflicts;
-$stow->process_tasks() unless %conflicts; 
+
+my @pkgs = ('files');
+$stow->plan_stow(@pkgs);
+
+# my %conflicts = $stow->get_conflicts();
+$stow->process_tasks();
+print "done\n";
 
diff --git a/files/bash/.bash_profile b/files/.bash_profile
similarity index 100%
rename from files/bash/.bash_profile
rename to files/.bash_profile
diff --git a/files/bash/.bashrc b/files/.bashrc
similarity index 100%
rename from files/bash/.bashrc
rename to files/.bashrc
diff --git a/files/fish/config.fish b/files/.config/fish/config.fish
similarity index 100%
rename from files/fish/config.fish
rename to files/.config/fish/config.fish
diff --git a/files/fish/fishfile b/files/.config/fish/fishfile
similarity index 100%
rename from files/fish/fishfile
rename to files/.config/fish/fishfile
diff --git a/files/vim/init.vim b/files/.config/nvim/init.vim
similarity index 100%
rename from files/vim/init.vim
rename to files/.config/nvim/init.vim
diff --git a/files/vim/plugins.vim b/files/.config/nvim/plugins.vim
similarity index 100%
rename from files/vim/plugins.vim
rename to files/.config/nvim/plugins.vim
diff --git a/files/git/.gitconfig b/files/.gitconfig
similarity index 100%
rename from files/git/.gitconfig
rename to files/.gitconfig
diff --git a/files/git/.gitignore_global b/files/.gitignore_global
similarity index 100%
rename from files/git/.gitignore_global
rename to files/.gitignore_global
diff --git a/files/bash/.profile b/files/.profile
similarity index 100%
rename from files/bash/.profile
rename to files/.profile
diff --git a/files/ssh/config b/files/.ssh/config
similarity index 100%
rename from files/ssh/config
rename to files/.ssh/config
diff --git a/files/fish/functions/nvm.fish b/files/fish/functions/nvm.fish
deleted file mode 100644
index 575d0e3..0000000
--- a/files/fish/functions/nvm.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function nvm
-    bass source $NVM_DIR/nvm.sh --no-use ';' nvm $argv
-end
-
diff --git a/files/fish/functions/update.fish b/files/fish/functions/update.fish
deleted file mode 100644
index e64b01e..0000000
--- a/files/fish/functions/update.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function update -d 'run dotfiles install'
-    make --directory="$WORKSPACE/dotfiles"
-end
diff --git a/install/01-bash.sh b/install/01-bash.sh
deleted file mode 100755
index 87fa916..0000000
--- a/install/01-bash.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-source "$(dirname $0)/utils.sh"
-
-bash_source="$dotfiles_dir/bash"
-bash_target="$HOME"
-link_folder "$bash_source" "$bash_target"
-echo "bash dotfiles are linked"
-
-sudo chmod -R 0644 /etc/update-motd.d/
-
-bash --version
diff --git a/install/02-fish.sh b/install/02-fish.sh
index e7d9bcd..7d3f634 100755
--- a/install/02-fish.sh
+++ b/install/02-fish.sh
@@ -9,11 +9,6 @@ if not_installed "fish"; then
 fi
 echo "fish is installed"
 
-fish_source="$dotfiles_dir/fish"
-fish_target="$XDG_CONFIG_HOME/fish"
-link_folder "$fish_source" "$fish_target"
-echo "fish dotfiles linked"
-
 fish --version
 
 fisher_location="$XDG_CONFIG_HOME/fish/functions/fisher.fish"
diff --git a/install/03-ssh.sh b/install/03-ssh.sh
index bd8395b..ad40637 100755
--- a/install/03-ssh.sh
+++ b/install/03-ssh.sh
@@ -11,8 +11,4 @@ if [ ! -f "$ssh_key" ]; then
 fi
 echo "ssh key exists"
 
-# ssh dotfiles are symlinked
-ssh_source="$dotfiles_dir/ssh"
-link_folder "$ssh_source" "$ssh_target"
-echo "ssh dotfiles are symlinked"
 cat "$ssh_pub"
diff --git a/install/04-git.sh b/install/04-git.sh
deleted file mode 100755
index 7bc3589..0000000
--- a/install/04-git.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-source "$(dirname $0)/utils.sh"
-
-# git dotfiles are symlinked
-git_source="$dotfiles_dir/git"
-git_target="$HOME"
-link_folder "$git_source" "$git_target"
-printf "git dotfiles linked\n"
-git --version
diff --git a/install/16-vim.sh b/install/16-vim.sh
index 619c9ae..20aa89d 100755
--- a/install/16-vim.sh
+++ b/install/16-vim.sh
@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 source "$(dirname $0)/utils.sh"
 
-vim_source="$dotfiles_dir/vim"
-vim_target="$XDG_CONFIG_HOME/nvim"
-link_folder "$vim_source" "$vim_target"
-echo "vim dotfiles are linked"
-
 mkdir -p "$XDG_DATA_HOME/nvim/backup"
 plug_target="$XDG_DATA_HOME/nvim/site/autoload/plug.vim"
 if [ ! -f $plug_target ]; then