Renamed from *.services.* package to *.core.* package. Removed unit tests from datastore modules...
Refactoring