Rearrange files and fix typo in Vagrantfile.