Restructure project so that it works with Vundle