Reorganized default structure
Merge remote-tracking branch 'origin/feature/snippets' into feature/snippets

Conflicts:
	app/config/config.yml