Restructure code + recreate login page
Merge branch 'evaRestructureCode'

Conflicts:
	config.codekit