B-60117 Classes moved to service module