Move app code to app
Clean up