Moved everything around, db now can live standalone