Remove now unused debug function
Move service struct into directory struct