Refactored service classes

Moved classes relating to services into areas where Moodle will autoload
them