Remove submodules
Added them again
Moved vagrant stuff to vagrant folder