Cleanup and Persistence Prep

enabled the persistence system and cleaned up initial setup of files.