Restructured Codebase
Modified workspace
Merge branch 'refactoring'

Conflicts:
	.idea/workspace.xml