Tidied up package

[rubenthoms]

• Removed unnecessary code and dependencies
• Implemented new service class pattern
• Renamed variables in order to improve readability
• Refactored code for better readability