Move project over and cleanup views, controllers