ECL-48 More cases for testing file api.
Refactoring - changed package name for services internals.