Moved all service-related class to the new repo