Move app controlr and model into main project