# limitations under the License.\r
\r
# from o2ims.domain.resource_type import ResourceTypeEnum\r
-from o2ims.service.client.base_client import BaseClient\r
+from o2common.service.client.base_client import BaseClient\r
from o2ims.domain.stx_object import StxGenericModel\r
-# from o2ims.service.unit_of_work import AbstractUnitOfWork\r
-from o2ims.service.watcher.base import BaseWatcher\r
+# from o2common.service.unit_of_work import AbstractUnitOfWork\r
+from o2common.service.watcher.base import BaseWatcher\r
from o2ims.domain import commands\r
-from o2ims.service.messagebus import MessageBus\r
+from o2common.service.messagebus import MessageBus\r
\r
from o2common.helper import o2logging\r
logger = o2logging.get_logger(__name__)\r