moving classes to service package