Reorganising code, getting rid of vagrant since I never use it