More project restructuring...
Merge branch 'master' of github.com:hpxro7/UWSchedule

Conflicts:
	.idea/workspace.xml
	UWSchedule.iml
	UWScheduleProject.iml