Restructure directories and improve Vagrantfile