Fix issues in configuration after merge.
Fix service definitions.
Refactor splitting classes.
Merge pull request #63 from trylika/services

Fix issues in configuration after merge.