Move services outside the project-mercury namespace