Refactorings; removed Service-suffix from some modules seeing as though they already have to inherit from Service. Also what's the point in long names.