Moved DataStore classes to one level up