diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 610e55a..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "dotbot"]
-     path = dotbot
-     url = https://github.com/anishathalye/dotbot
diff --git a/README.md b/README.md
index 3657d45..27c865b 100644
--- a/README.md
+++ b/README.md
@@ -3,25 +3,20 @@
 Configuration files (often called dot-files because they start with a ".") for
 the applications I use on a regular basis. 
 
-No special pre-requisites, that I'm aware of. The `install` script requires
-Python. Of course, the configuration files require the related applications
-to be applicable.
-
 More details about specific application configurations can be found in their
 respective directories.
 
-##dotbot
-To assist with organization, I utilize 
-[dotbot](https://github.com/anishathalye/dotbot) for automation. 
+###Requirements
+
+You'll need `make` for the automated linking of the dotfiles.
+Obviously you'll need the related program for each config file to be applicable.
 
 ##Installation
-To integrate *all* dotfiles in this repo:
-
 > 1. git clone git@github.com:VagabondAzulien/dotfiles.git
 >
 > 2. cd dotfiles
 >
-> 3. ./install
+> 3. Type `make` to see your options
 
 ##Applications Configured
 * Vim \[ vim/vim/ => ~/.vim \]\[ vim/vimrc => ~/.vimrc \]\[ vim/vimrc.bundles =>
@@ -31,13 +26,11 @@ To integrate *all* dotfiles in this repo:
 
 ##To-Do
 * [ ] irssi config files
-* [ ] shell config files
+* [ ] Bash config files
+* [ ] Improve makefile
 
-#Licenses
-Dotbot is (c) Anish Athalye, and licensed under the [MIT
-License](https://github.com/anishathalye/dotbot/blob/master/LICENSE.md).
-
-All other files are licensed under the [WTFPL](http://www.wtfpl.net/), the full
+##License
+All files are licensed under the [WTFPL](http://www.wtfpl.net/), the full
 license text of which can be found below.
 
 > **DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE**
diff --git a/dotbot b/dotbot
deleted file mode 160000
index db83644..0000000
--- a/dotbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit db8364490da392b4225844ddfc32e5fa69aa3821
diff --git a/install b/install
deleted file mode 100755
index b1baa33..0000000
--- a/install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-CONFIG="install.conf.yaml"
-DOTBOT_DIR="dotbot"
-
-DOTBOT_BIN="bin/dotbot"
-BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-cd "${BASEDIR}"
-git submodule update --init --recursive "${DOTBOT_DIR}"
-
-"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}"
diff --git a/install.conf.yaml b/install.conf.yaml
deleted file mode 100644
index 4468cfc..0000000
--- a/install.conf.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- clean: ['~']
-
-- link:
-     ~/.dotfiles: ''
-     ~/.vim: vim/vim/
-     ~/.vimrc: vim/vimrc
-     ~/.vimrc.bundles: vim/vimrc.bundles
-     ~/.gitconfig: git/gitconfig
-     ~/.gitignore: git/gitignore
-     ~/.tmux.conf: tmux/tmux.conf
-
-- shell:
-     - [git submodule update --init --recursive, Installing submodules]
diff --git a/makefile b/makefile
index 9ff3dd7..60759e4 100644
--- a/makefile
+++ b/makefile
@@ -5,6 +5,7 @@
      build-default \
      build-simple \
      install-vim-config \
+     install-vim-dir \
      install-vim-plugin \
      install-git \
      install-tmux \
@@ -19,11 +20,12 @@ help:			## Display this menu
         awk 'BEGIN {FS = ":.*?## "}; {printf "%-25s %s\n", $$1, $$2}'
 
 link-dotfiles:		## Create dotfiles link in Home directory
-	ln -s -- "$(CURDIR)" "$(HOME)"/.dotfiles/
+	ln -s -- "$(CURDIR)" "$(HOME)"/.dotfiles
 
 build-default:		## Create default environment, using all dotfiles
 build-default: link-dotfiles \
      install-vim-config \
+     install-vim-dir \
      install-vim-plugin \
      install-git \
      install-tmux \
@@ -41,12 +43,15 @@ install-vim-config:	## Create vimrc file in Home directory
 install-vim-plugin:	## Create vimrc-plugins (Plugin file) in Home directory
 	ln -s -- "$(CURDIR)"/vim/vimrc-plugins "$(HOME)"/.vimrc-plugins
 
+install-vim-dir:	## Create vim directory in Home directory
+	ln -s -- "$(CURDIR)"/vim/vim/ "$(HOME)"/.vim
+
 install-git:		## Create git config and ignore files in Home directory
 	ln -s -- "$(CURDIR)"/git/gitconfig "$(HOME)"/.gitconfig
 	ln -s -- "$(CURDIR)"/git/gitignore "$(HOME)"/.gitignore
 
 install-tmux:		## Create tmux config file in Home directory
-	ln -s -- "$(CURDIR)"/tmux/tmux.config "$(HOME)"/.tmux.config
+	ln -s -- "$(CURDIR)"/tmux/tmux.conf "$(HOME)"/.tmux.conf
 
 install-bash-config:	## Create bash config file in Home directory