Renaming Service related classes to clarify
left over changes
comments
Renames and comments

Things are clearer now