cleanup service configuration files and move unit tests into Unit namespace
Merge pull request #42 from ddeboer/cleanups

cleanup service configuration files and move unit tests into Unit namespace