Moved Service classes to their own package