Class refactor - moved services to proper package, removed test class.