Cleanup and prep for adding controllers and public views