Moved Controller project into proper location and deleted unused files from previous refactoring effort.