refactor directory structure
Merge branch 'master' of https://github.com/arbipher/shadow

Conflicts:
	controllers/auth.py
	controllers/resources.py