cleanup service configuration files and move unit tests into Unit namespace

This will break every pull request touching tests or the DI configuration...

But i think we need to clean up the naming. This is already a start, but there might be more.