Tidy services directory

The services directory is becoming rather large. This may help to make it a little tidier in there.