Code structure changes

Moved DataStoreUtils into DataStoreManager
Fixed bug in DataStoreManager