Refactored remaining "service" classes out into proper packages
Increased code coverage