renaming and new location of data stores WIP