Moved data stores to default package
Removed datastores from model package