diff --git a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/audit/AuditLogService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/audit/AuditLogService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/EntityService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/entity/EntityService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/event/EventService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java