cleanup service configuration files and move unit tests into Unit namespace