Consolidated the controllers and models, base classed the uimodule