More work on making service names look like any other objects
Removing old files