diff --git a/bashrc b/bashrc
new file mode 100644
index 0000000..875f4e0
--- /dev/null
+++ b/bashrc
@@ -0,0 +1,113 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+    # We have color support; assume it's compliant with Ecma-48
+    # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+    # a case would tend to support setf rather than setaf.)
+        color_prompt=yes
+    else
+        color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1="\033[1;35m╭── \u\033[33m::\033[34m\w\033[0m\n\033[35m╰▶  \033[0m"
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto --group-directories-first'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    source ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    source /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    source /etc/bash_completion
+  fi
+fi
+
+# Add dotfiles scripts to the path
+if [ -d ~/.config/dotfiles/bin ]; then
+    export PATH=~/.config/dotfiles/bin:$PATH
+fi
diff --git a/zsh/bin/copy b/bin/copy
similarity index 100%
rename from zsh/bin/copy
rename to bin/copy
diff --git a/zsh/bin/swap b/bin/swap
similarity index 100%
rename from zsh/bin/swap
rename to bin/swap
diff --git a/zsh/bin/update b/bin/update
similarity index 100%
rename from zsh/bin/update
rename to bin/update
diff --git a/zsh/bin/vim-recover b/bin/vim-recover
similarity index 100%
rename from zsh/bin/vim-recover
rename to bin/vim-recover
diff --git a/init.sh b/init.sh
deleted file mode 100755
index 89879b6..0000000
--- a/init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-git clone http://github.com/robbyrussell/oh-my-zsh ~/.config/oh-my-zsh
-git clone http://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-mkdir ~/.vim/swp ~/.vim/backups ~/.vim/undo
-
diff --git a/make-links.sh b/make-links.sh
deleted file mode 100755
index 9379845..0000000
--- a/make-links.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#/bin/bash
-
-DIRNAME=`dirname $0`
-
-# make-link source target
-make_link() {
-
-    rm -rf $HOME/$2 && ln -s $PWD/$DIRNAME/$1 $HOME/$2
-    echo `realpath $PWD/$DIRNAME/$1`:'->':`realpath $HOME/$2`
-
-}
-
-
-main() {
-
-    make_link zshrc .zshrc
-    make_link vimrc .vimrc
-    make_link ycm_extra_conf.py .vim/ycm_extra_conf.py
-    make_link awesome .config/awesome
-    make_link Xdefaults .Xdefaults
-    make_link yaourtrc .yaourtrc
-
-}
-
-main | column -t -s ':'
diff --git a/yaourtrc b/yaourtrc
deleted file mode 100644
index 437a09f..0000000
--- a/yaourtrc
+++ /dev/null
@@ -1,2 +0,0 @@
-BUILD_NOCONFIRM=1
-EDITFILES=0
diff --git a/zsh/path.zsh b/zsh/path.zsh
index f717f49..2ac4fbe 100644
--- a/zsh/path.zsh
+++ b/zsh/path.zsh
@@ -2,7 +2,7 @@
 export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH
 
 # The scripts path
-export PATH=$DOTFILES/zsh/bin:$PATH
+export PATH=$DOTFILES/bin:$PATH
 if [ -d "$HOME/.scripts" ]; then
     export PATH=$HOME/.scripts:$PATH
 fi