Issue #202 - Move Controller to correct directory