Begin reorganizing to support spinning up in digital ocean