Moved Controller to App/Lib