Move to commons module model and service interface.