Merge branch 'structure' of https://github.com/lypant/archon into structure

Conflicts:
	setup/settings.conf
Merge branch 'structure' of https://github.com/lypant/archon into structure