Restructured folders again for easier deployment, do not need Makefile, and vagrant should not be here