Flattedend the stucture a bit
Merge branch 'master' into custom-user

* master:
  Flattedend the stucture a bit

Conflicts:
	vagrant.bootstrap.sh