Moving services into own namespace