diff --git a/server/app/app.cue b/server/app/app.cue
index 5614963bc..d42c79a00 100644
--- a/server/app/app.cue
+++ b/server/app/app.cue
@@ -1,12 +1,12 @@
 package app
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
-	"github.com/cortezaproject/corteza-server/app/options"
-	"github.com/cortezaproject/corteza-server/system"
-	"github.com/cortezaproject/corteza-server/compose"
-	"github.com/cortezaproject/corteza-server/automation"
-	"github.com/cortezaproject/corteza-server/federation"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app/options"
+	"github.com/cortezaproject/corteza/server/system"
+	"github.com/cortezaproject/corteza/server/compose"
+	"github.com/cortezaproject/corteza/server/automation"
+	"github.com/cortezaproject/corteza/server/federation"
 )
 
 corteza: schema.#platform & {
diff --git a/server/app/options/RBAC.cue b/server/app/options/RBAC.cue
index c72b14ead..b04b62dfc 100644
--- a/server/app/options/RBAC.cue
+++ b/server/app/options/RBAC.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 RBAC: schema.#optionsGroup & {
diff --git a/server/app/options/SCIM.cue b/server/app/options/SCIM.cue
index 61785e28d..c6dd5332f 100644
--- a/server/app/options/SCIM.cue
+++ b/server/app/options/SCIM.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 SCIM: schema.#optionsGroup & {
diff --git a/server/app/options/SMTP.cue b/server/app/options/SMTP.cue
index bfb5adabd..9a339ef16 100644
--- a/server/app/options/SMTP.cue
+++ b/server/app/options/SMTP.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 SMTP: schema.#optionsGroup & {
diff --git a/server/app/options/action_log.cue b/server/app/options/action_log.cue
index 8784387e7..fd5c72066 100644
--- a/server/app/options/action_log.cue
+++ b/server/app/options/action_log.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 actionLog: schema.#optionsGroup & {
diff --git a/server/app/options/api_gateway.cue b/server/app/options/api_gateway.cue
index 72dffe347..a19459105 100644
--- a/server/app/options/api_gateway.cue
+++ b/server/app/options/api_gateway.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 apigw: schema.#optionsGroup & {
diff --git a/server/app/options/auth.cue b/server/app/options/auth.cue
index 653aa9378..ec94e7d4a 100644
--- a/server/app/options/auth.cue
+++ b/server/app/options/auth.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 auth: schema.#optionsGroup & {
diff --git a/server/app/options/corredor.cue b/server/app/options/corredor.cue
index 87153db99..f44373364 100644
--- a/server/app/options/corredor.cue
+++ b/server/app/options/corredor.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 corredor: schema.#optionsGroup & {
diff --git a/server/app/options/db.cue b/server/app/options/db.cue
index 3e33a0954..f94380b24 100644
--- a/server/app/options/db.cue
+++ b/server/app/options/db.cue
@@ -1,12 +1,11 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 DB: schema.#optionsGroup & {
-	handle: "db"
-	expIdent: "DB"
+	handle: "DB"
 	options: {
 		DSN: {
 			defaultValue: "sqlite3://file::memory:?cache=shared&mode=memory"
diff --git a/server/app/options/discovery.cue b/server/app/options/discovery.cue
index 8c34bd802..3b56c0559 100644
--- a/server/app/options/discovery.cue
+++ b/server/app/options/discovery.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 discovery: schema.#optionsGroup & {
diff --git a/server/app/options/environment.cue b/server/app/options/environment.cue
index a8da49e5f..dcf0407f0 100644
--- a/server/app/options/environment.cue
+++ b/server/app/options/environment.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 environment: schema.#optionsGroup & {
diff --git a/server/app/options/eventbus.cue b/server/app/options/eventbus.cue
index 41a7c92e1..6db1c86eb 100644
--- a/server/app/options/eventbus.cue
+++ b/server/app/options/eventbus.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 eventbus: schema.#optionsGroup & {
diff --git a/server/app/options/federation.cue b/server/app/options/federation.cue
index dcd8dd69b..2ced5901b 100644
--- a/server/app/options/federation.cue
+++ b/server/app/options/federation.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 federation: schema.#optionsGroup & {
diff --git a/server/app/options/http_client.cue b/server/app/options/http_client.cue
index 3d3296a89..26d728aa9 100644
--- a/server/app/options/http_client.cue
+++ b/server/app/options/http_client.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 HTTPClient: schema.#optionsGroup & {
diff --git a/server/app/options/http_server.cue b/server/app/options/http_server.cue
index 476cd6f06..4d0037c13 100644
--- a/server/app/options/http_server.cue
+++ b/server/app/options/http_server.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 HTTPServer: schema.#optionsGroup & {
@@ -9,7 +9,7 @@ HTTPServer: schema.#optionsGroup & {
 	title:  "HTTP Server"
 
 	imports: [
-		"\"github.com/cortezaproject/corteza-server/pkg/rand\"",
+		"\"github.com/cortezaproject/corteza/server/pkg/rand\"",
 	]
 
 	options: {
diff --git a/server/app/options/limit.cue b/server/app/options/limit.cue
index f9d137441..38293915b 100644
--- a/server/app/options/limit.cue
+++ b/server/app/options/limit.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 limit: schema.#optionsGroup & {
diff --git a/server/app/options/locale.cue b/server/app/options/locale.cue
index 1aef0dce3..b7caf1028 100644
--- a/server/app/options/locale.cue
+++ b/server/app/options/locale.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 locale: schema.#optionsGroup & {
diff --git a/server/app/options/log.cue b/server/app/options/log.cue
index e0cc11f05..ce614704c 100644
--- a/server/app/options/log.cue
+++ b/server/app/options/log.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 log: schema.#optionsGroup & {
diff --git a/server/app/options/messagebus.cue b/server/app/options/messagebus.cue
index e8f9f0d7f..26e664df7 100644
--- a/server/app/options/messagebus.cue
+++ b/server/app/options/messagebus.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 messagebus: schema.#optionsGroup & {
diff --git a/server/app/options/monitor.cue b/server/app/options/monitor.cue
index 16757bb6f..e0f00bc02 100644
--- a/server/app/options/monitor.cue
+++ b/server/app/options/monitor.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 monitor: schema.#optionsGroup & {
diff --git a/server/app/options/object_store.cue b/server/app/options/object_store.cue
index ea9c200ee..ecaa56005 100644
--- a/server/app/options/object_store.cue
+++ b/server/app/options/object_store.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 objectStore: schema.#optionsGroup & {
diff --git a/server/app/options/provision.cue b/server/app/options/provision.cue
index 50151b55f..62516c73b 100644
--- a/server/app/options/provision.cue
+++ b/server/app/options/provision.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 provision: schema.#optionsGroup & {
diff --git a/server/app/options/seeder.cue b/server/app/options/seeder.cue
index 98c891da6..f8b318fae 100644
--- a/server/app/options/seeder.cue
+++ b/server/app/options/seeder.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 seeder: schema.#optionsGroup & {
diff --git a/server/app/options/sentry.cue b/server/app/options/sentry.cue
index b89d4e22d..3b58b52e8 100644
--- a/server/app/options/sentry.cue
+++ b/server/app/options/sentry.cue
@@ -1,14 +1,14 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 sentry: schema.#optionsGroup & {
 	handle: "sentry"
 
 	imports: [
-		"\"github.com/cortezaproject/corteza-server/pkg/version\"",
+		"\"github.com/cortezaproject/corteza/server/pkg/version\"",
 	]
 
 	title: "Sentry monitoring"
diff --git a/server/app/options/template.cue b/server/app/options/template.cue
index a89a4af0e..cee7add98 100644
--- a/server/app/options/template.cue
+++ b/server/app/options/template.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 template: schema.#optionsGroup & {
diff --git a/server/app/options/upgrade.cue b/server/app/options/upgrade.cue
index f87a53a27..442816ff7 100644
--- a/server/app/options/upgrade.cue
+++ b/server/app/options/upgrade.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 upgrade: schema.#optionsGroup & {
diff --git a/server/app/options/wait_for.cue b/server/app/options/wait_for.cue
index c63b8e245..e031052b6 100644
--- a/server/app/options/wait_for.cue
+++ b/server/app/options/wait_for.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 waitFor: schema.#optionsGroup & {
diff --git a/server/app/options/websocket.cue b/server/app/options/websocket.cue
index 48b4453a0..72b5d1f8d 100644
--- a/server/app/options/websocket.cue
+++ b/server/app/options/websocket.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 websocket: schema.#optionsGroup & {
diff --git a/server/app/options/workflow.cue b/server/app/options/workflow.cue
index f57d65046..f7892f08a 100644
--- a/server/app/options/workflow.cue
+++ b/server/app/options/workflow.cue
@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 workflow: schema.#optionsGroup & {
diff --git a/server/app/resources.cue b/server/app/resources.cue
index 2086d39a6..fdf43429e 100644
--- a/server/app/resources.cue
+++ b/server/app/resources.cue
@@ -1,7 +1,7 @@
 package app
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 _allFeaturesDisabled: {
@@ -15,7 +15,7 @@ resources: { [key=_]: {"handle": key, "component": "system", "platform": "cortez
 	"rbac-rule": {
 		package: {
 			ident: "rbac"
-			import: "github.com/cortezaproject/corteza-server/pkg/rbac"
+			import: "github.com/cortezaproject/corteza/server/pkg/rbac"
 		}
 
 		ident: "rule"
@@ -72,7 +72,7 @@ resources: { [key=_]: {"handle": key, "component": "system", "platform": "cortez
 	"label": {
 		package: {
 			ident: "labels"
-			import: "github.com/cortezaproject/corteza-server/pkg/label/types"
+			import: "github.com/cortezaproject/corteza/server/pkg/label/types"
 		}
 
 		ident: "label"
@@ -154,7 +154,7 @@ resources: { [key=_]: {"handle": key, "component": "system", "platform": "cortez
 	"flag": {
 		package: {
 			ident: "flag"
-			import: "github.com/cortezaproject/corteza-server/pkg/flag/types"
+			import: "github.com/cortezaproject/corteza/server/pkg/flag/types"
 		}
 
 		ident: "flag"
@@ -228,7 +228,7 @@ resources: { [key=_]: {"handle": key, "component": "system", "platform": "cortez
 	"actionlog": {
 		package: {
 			ident: "actionlog"
-			import: "github.com/cortezaproject/corteza-server/pkg/actionlog"
+			import: "github.com/cortezaproject/corteza/server/pkg/actionlog"
 		}
 
 		ident: "action"
@@ -328,7 +328,7 @@ resources: { [key=_]: {"handle": key, "component": "system", "platform": "cortez
 	"resource-activity": {
 		package: {
 			ident: "discovery"
-			import: "github.com/cortezaproject/corteza-server/pkg/discovery/types"
+			import: "github.com/cortezaproject/corteza/server/pkg/discovery/types"
 		}
 
 		ident: "resourceActivity"
diff --git a/server/automation/automation/apigw_body_handler.yaml b/server/automation/automation/apigw_body_handler.yaml
index 72d61ad7a..552a68d21 100644
--- a/server/automation/automation/apigw_body_handler.yaml
+++ b/server/automation/automation/apigw_body_handler.yaml
@@ -1,7 +1,7 @@
 name: apigwBody
 
 imports:
-  - github.com/cortezaproject/corteza-server/pkg/http
+  - github.com/cortezaproject/corteza/server/pkg/http
 
 functions:
   read:
diff --git a/server/automation/automation/email_handler.yaml b/server/automation/automation/email_handler.yaml
index dfcc90f90..6e1d74060 100644
--- a/server/automation/automation/email_handler.yaml
+++ b/server/automation/automation/email_handler.yaml
@@ -2,7 +2,7 @@ name: email
 
 imports:
   - io
-  - sysTypes github.com/cortezaproject/corteza-server/system/types
+  - sysTypes github.com/cortezaproject/corteza/server/system/types
 
 
 messageParams: &messageParams
diff --git a/server/automation/component.cue b/server/automation/component.cue
index 9e71839f5..03b0757e2 100644
--- a/server/automation/component.cue
+++ b/server/automation/component.cue
@@ -1,7 +1,7 @@
 package automation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 component: schema.#component & {
diff --git a/server/automation/rest.yaml b/server/automation/rest.yaml
index 4f2253c34..bcbff3e4e 100644
--- a/server/automation/rest.yaml
+++ b/server/automation/rest.yaml
@@ -11,9 +11,9 @@ endpoints:
   entrypoint: workflow
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/expr
-    - github.com/cortezaproject/corteza-server/automation/types
-    - github.com/cortezaproject/corteza-server/pkg/label
+    - github.com/cortezaproject/corteza/server/pkg/expr
+    - github.com/cortezaproject/corteza/server/automation/types
+    - github.com/cortezaproject/corteza/server/pkg/label
   apis:
   - name: list
     method: GET
@@ -109,9 +109,9 @@ endpoints:
   entrypoint: trigger
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/automation/types
-    - github.com/cortezaproject/corteza-server/pkg/expr
-    - github.com/cortezaproject/corteza-server/pkg/label
+    - github.com/cortezaproject/corteza/server/automation/types
+    - github.com/cortezaproject/corteza/server/pkg/expr
+    - github.com/cortezaproject/corteza/server/pkg/label
   apis:
   - name: list
     method: GET
@@ -184,8 +184,8 @@ endpoints:
   entrypoint: session
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/expr
-    - github.com/cortezaproject/corteza-server/automation/types
+    - github.com/cortezaproject/corteza/server/pkg/expr
+    - github.com/cortezaproject/corteza/server/automation/types
   apis:
   - name: list
     method: GET
@@ -285,7 +285,7 @@ endpoints:
   - Client ID
   - Session ID
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/rbac
+    - github.com/cortezaproject/corteza/server/pkg/rbac
   apis:
   - name: list
     path: "/"
diff --git a/server/automation/service/access_control_actions.yaml b/server/automation/service/access_control_actions.yaml
index fa6d21082..a8c9a222e 100644
--- a/server/automation/service/access_control_actions.yaml
+++ b/server/automation/service/access_control_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/pkg/rbac
+  - github.com/cortezaproject/corteza/server/pkg/rbac
 
 props:
   - name: rule
diff --git a/server/automation/service/session_actions.yaml b/server/automation/service/session_actions.yaml
index 14e24040d..5b1306e72 100644
--- a/server/automation/service/session_actions.yaml
+++ b/server/automation/service/session_actions.yaml
@@ -4,7 +4,7 @@ resource: automation:session
 service: session
 
 import:
-  - github.com/cortezaproject/corteza-server/automation/types
+  - github.com/cortezaproject/corteza/server/automation/types
 
 # Default sensitivity for actions
 defaultActionSeverity: info
diff --git a/server/automation/service/trigger_actions.yaml b/server/automation/service/trigger_actions.yaml
index c784b44f8..f79b096f8 100644
--- a/server/automation/service/trigger_actions.yaml
+++ b/server/automation/service/trigger_actions.yaml
@@ -4,7 +4,7 @@ resource: automation:trigger
 service: trigger
 
 import:
-  - github.com/cortezaproject/corteza-server/automation/types
+  - github.com/cortezaproject/corteza/server/automation/types
 
 # Default sensitivity for actions
 defaultActionSeverity: info
diff --git a/server/automation/service/workflow_actions.yaml b/server/automation/service/workflow_actions.yaml
index 36b822774..e4573ebf7 100644
--- a/server/automation/service/workflow_actions.yaml
+++ b/server/automation/service/workflow_actions.yaml
@@ -4,7 +4,7 @@ resource: automation:workflow
 service: workflow
 
 import:
-  - github.com/cortezaproject/corteza-server/automation/types
+  - github.com/cortezaproject/corteza/server/automation/types
 
 # Default sensitivity for actions
 defaultActionSeverity: info
diff --git a/server/automation/session.cue b/server/automation/session.cue
index 04958cc4f..8f33a5923 100644
--- a/server/automation/session.cue
+++ b/server/automation/session.cue
@@ -1,7 +1,7 @@
 package automation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 session: {
diff --git a/server/automation/trigger.cue b/server/automation/trigger.cue
index b5de75f68..d4bfe3423 100644
--- a/server/automation/trigger.cue
+++ b/server/automation/trigger.cue
@@ -1,7 +1,7 @@
 package automation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 trigger: {
diff --git a/server/automation/workflow.cue b/server/automation/workflow.cue
index 312a1aefd..76ffef5eb 100644
--- a/server/automation/workflow.cue
+++ b/server/automation/workflow.cue
@@ -1,7 +1,7 @@
 package automation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 workflow: {
diff --git a/server/codegen/assets/templates/gocode/dal/$component_init.go.tpl b/server/codegen/assets/templates/gocode/dal/$component_init.go.tpl
index 083a497d5..f6bbad356 100644
--- a/server/codegen/assets/templates/gocode/dal/$component_init.go.tpl
+++ b/server/codegen/assets/templates/gocode/dal/$component_init.go.tpl
@@ -4,7 +4,7 @@ package {{ .package }}
 
 import (
 	"context"
-	"github.com/cortezaproject/corteza-server/pkg/dal"
+	"github.com/cortezaproject/corteza/server/pkg/dal"
 {{- range .imports }}
     {{ . }}
 {{- end }}
diff --git a/server/codegen/assets/templates/gocode/dal/$component_model.go.tpl b/server/codegen/assets/templates/gocode/dal/$component_model.go.tpl
index 578fe6e00..076c8d6fc 100644
--- a/server/codegen/assets/templates/gocode/dal/$component_model.go.tpl
+++ b/server/codegen/assets/templates/gocode/dal/$component_model.go.tpl
@@ -3,7 +3,7 @@ package {{ .package }}
 {{ template "gocode/header-gentext.tpl" }}
 
 import (
-	"github.com/cortezaproject/corteza-server/pkg/dal"
+	"github.com/cortezaproject/corteza/server/pkg/dal"
 {{- range .imports }}
     {{ . }}
 {{- end }}
diff --git a/server/codegen/assets/templates/gocode/envoy/resource_translation.go.tpl b/server/codegen/assets/templates/gocode/envoy/resource_translation.go.tpl
index 721d3462b..ff9b72631 100644
--- a/server/codegen/assets/templates/gocode/envoy/resource_translation.go.tpl
+++ b/server/codegen/assets/templates/gocode/envoy/resource_translation.go.tpl
@@ -3,7 +3,7 @@ package {{ .package }}
 {{ template "gocode/header-gentext.tpl" }}
 
 import (
-	systemTypes "github.com/cortezaproject/corteza-server/system/types"
+	systemTypes "github.com/cortezaproject/corteza/server/system/types"
 )
 
 {{- range .resources }}
diff --git a/server/codegen/assets/templates/gocode/locale/$component_service.go.tpl b/server/codegen/assets/templates/gocode/locale/$component_service.go.tpl
index 87b53119f..81a001733 100644
--- a/server/codegen/assets/templates/gocode/locale/$component_service.go.tpl
+++ b/server/codegen/assets/templates/gocode/locale/$component_service.go.tpl
@@ -8,14 +8,14 @@ import (
 {{- range .imports }}
     {{ . }}
 {{- end }}
-	"github.com/cortezaproject/corteza-server/pkg/actionlog"
-	intAuth "github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/pkg/filter"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/store"
-	systemTypes "github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	intAuth "github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/pkg/filter"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/store"
+	systemTypes "github.com/cortezaproject/corteza/server/system/types"
 	"golang.org/x/text/language"
 )
 
diff --git a/server/codegen/assets/templates/gocode/locale/$component_types.go.tpl b/server/codegen/assets/templates/gocode/locale/$component_types.go.tpl
index cb19153c6..3eeb54765 100644
--- a/server/codegen/assets/templates/gocode/locale/$component_types.go.tpl
+++ b/server/codegen/assets/templates/gocode/locale/$component_types.go.tpl
@@ -5,7 +5,7 @@ package {{ .package }}
 import (
 	"fmt"
 	"strconv"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
 )
 
 type (
diff --git a/server/codegen/assets/templates/gocode/rbac/$component_access_control.go.tpl b/server/codegen/assets/templates/gocode/rbac/$component_access_control.go.tpl
index d2cceadd1..15feb94fb 100644
--- a/server/codegen/assets/templates/gocode/rbac/$component_access_control.go.tpl
+++ b/server/codegen/assets/templates/gocode/rbac/$component_access_control.go.tpl
@@ -7,11 +7,11 @@ import (
 	"github.com/spf13/cast"
 	"strings"
 	"context"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/pkg/rbac"
-	"github.com/cortezaproject/corteza-server/pkg/actionlog"
-	systemTypes "github.com/cortezaproject/corteza-server/system/types"
-	internalAuth "github.com/cortezaproject/corteza-server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/pkg/rbac"
+	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	systemTypes "github.com/cortezaproject/corteza/server/system/types"
+	internalAuth "github.com/cortezaproject/corteza/server/pkg/auth"
 {{- range .imports }}
     {{ . }}
 {{- end }}
diff --git a/server/codegen/assets/templates/gocode/store/interfaces.go.tpl b/server/codegen/assets/templates/gocode/store/interfaces.go.tpl
index 0fb8fc891..74a7579cb 100644
--- a/server/codegen/assets/templates/gocode/store/interfaces.go.tpl
+++ b/server/codegen/assets/templates/gocode/store/interfaces.go.tpl
@@ -8,8 +8,8 @@ import (
 {{- range $path, $alias :=  .imports }}
     {{ $alias }} {{ printf "%q" $path }}
 {{- end }}
-  "github.com/cortezaproject/corteza-server/pkg/dal"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
+  "github.com/cortezaproject/corteza/server/pkg/dal"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
 	"golang.org/x/text/language"
 )
 
diff --git a/server/codegen/assets/templates/gocode/store/rdbms/aux_types.go.tpl b/server/codegen/assets/templates/gocode/store/rdbms/aux_types.go.tpl
index 6721e9c6c..46d0ac5bf 100644
--- a/server/codegen/assets/templates/gocode/store/rdbms/aux_types.go.tpl
+++ b/server/codegen/assets/templates/gocode/store/rdbms/aux_types.go.tpl
@@ -4,7 +4,7 @@ package rdbms
 
 import (
 	"time"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
 {{- range $path, $alias :=  .imports }}
     {{ $alias }} {{ printf "%q" $path }}
 {{- end }}
diff --git a/server/codegen/assets/templates/gocode/store/rdbms/rdbms.go.tpl b/server/codegen/assets/templates/gocode/store/rdbms/rdbms.go.tpl
index d248d698d..55f5c7ff4 100644
--- a/server/codegen/assets/templates/gocode/store/rdbms/rdbms.go.tpl
+++ b/server/codegen/assets/templates/gocode/store/rdbms/rdbms.go.tpl
@@ -10,10 +10,10 @@ import (
 
 	"github.com/doug-martin/goqu/v9"
 	"github.com/doug-martin/goqu/v9/exp"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/pkg/filter"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/store"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/pkg/filter"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/store"
 {{- range $path, $alias :=  .imports }}
     {{ $alias }} {{ printf "%q" $path }}
 {{- end }}
diff --git a/server/codegen/assets/templates/gocode/store/tests/all.go.tpl b/server/codegen/assets/templates/gocode/store/tests/all.go.tpl
index 35d20db9a..d4d7331ed 100644
--- a/server/codegen/assets/templates/gocode/store/tests/all.go.tpl
+++ b/server/codegen/assets/templates/gocode/store/tests/all.go.tpl
@@ -5,7 +5,7 @@ package tests
 import (
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/store"
+	"github.com/cortezaproject/corteza/server/store"
 )
 
 func testAllGenerated(t *testing.T, s store.Storer) {
diff --git a/server/codegen/docs.options.cue b/server/codegen/docs.options.cue
index e08dec264..dee4f8765 100644
--- a/server/codegen/docs.options.cue
+++ b/server/codegen/docs.options.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 [...schema.#codegen] &
diff --git a/server/codegen/docs.rbac.cue b/server/codegen/docs.rbac.cue
index 199e1d3bb..dfb78d407 100644
--- a/server/codegen/docs.rbac.cue
+++ b/server/codegen/docs.rbac.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
-	"github.com/cortezaproject/corteza-server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
 )
 
 #_indexPayload: {
diff --git a/server/codegen/server.dal_models.cue b/server/codegen/server.dal_models.cue
index 28cc2d893..6d3bb185f 100644
--- a/server/codegen/server.dal_models.cue
+++ b/server/codegen/server.dal_models.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-  "github.com/cortezaproject/corteza-server/app"
-  "github.com/cortezaproject/corteza-server/codegen/schema"
+  "github.com/cortezaproject/corteza/server/app"
+  "github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 
@@ -127,7 +127,7 @@ _dalModelFn: {
       package: "model"
 
       imports: [
-        "\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
+        "\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
       ]
 
       // Operation/resource validators, grouped by resource
diff --git a/server/codegen/server.envoy_rbac.cue b/server/codegen/server.envoy_rbac.cue
index 648dde372..7a06ce0c6 100644
--- a/server/codegen/server.envoy_rbac.cue
+++ b/server/codegen/server.envoy_rbac.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 	// "strings"
 )
 
@@ -14,7 +14,7 @@ import (
 		payload: {
 			package: "resource"
 			imports: [
-				"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
+				"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
 			]
 
 			resources: [
@@ -37,7 +37,7 @@ import (
 			package: "resource"
 			imports: [
 				for cmp in app.corteza.components {
-					"\(cmp.ident)Types \"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\""
+					"\(cmp.ident)Types \"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\""
 				},
 			]
 
@@ -88,7 +88,7 @@ import (
 			package: "resource"
 			imports: [
 				for cmp in app.corteza.components for res in cmp.resources if res.locale != _|_ {
-					"\(cmp.ident)Types \"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\""
+					"\(cmp.ident)Types \"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\""
 				},
 			]
 
@@ -115,7 +115,7 @@ import (
 			payload: {
 				package: "resource"
 				imports: [
-					"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
+					"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
 				]
 
 				resources: [
diff --git a/server/codegen/server.locale_service.cue b/server/codegen/server.locale_service.cue
index a7a59501d..1a4189e3a 100644
--- a/server/codegen/server.locale_service.cue
+++ b/server/codegen/server.locale_service.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 [...schema.#codegen] &
@@ -15,7 +15,7 @@ import (
 			payload: {
 				package: "service"
 				imports: [
-					"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
+					"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
 				]
 
 				resources: [
diff --git a/server/codegen/server.locale_types.cue b/server/codegen/server.locale_types.cue
index f261ad0a5..5693c5863 100644
--- a/server/codegen/server.locale_types.cue
+++ b/server/codegen/server.locale_types.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 	"strings"
 )
 
diff --git a/server/codegen/server.options.cue b/server/codegen/server.options.cue
index 3d5cb4298..0c44bc2bc 100644
--- a/server/codegen/server.options.cue
+++ b/server/codegen/server.options.cue
@@ -2,8 +2,8 @@ package codegen
 
 import (
 	"strings"
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 [...schema.#codegen] &
diff --git a/server/codegen/server.rbac_access_control.cue b/server/codegen/server.rbac_access_control.cue
index ef3b7d058..c1fc63ebe 100644
--- a/server/codegen/server.rbac_access_control.cue
+++ b/server/codegen/server.rbac_access_control.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
-	"github.com/cortezaproject/corteza-server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
 )
 
 [...schema.#codegen] &
@@ -13,7 +13,7 @@ import (
 		payload: {
 			package: "service"
 			imports: [
-				"\"github.com/cortezaproject/corteza-server/\(cmp.ident)/types\"",
+				"\"github.com/cortezaproject/corteza/server/\(cmp.ident)/types\"",
 			]
 
 			// All known RBAC resources
diff --git a/server/codegen/server.rbac_types.cue b/server/codegen/server.rbac_types.cue
index f4b83d4fb..3e7d67680 100644
--- a/server/codegen/server.rbac_types.cue
+++ b/server/codegen/server.rbac_types.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 [...schema.#codegen] &
diff --git a/server/codegen/server.store.cue b/server/codegen/server.store.cue
index c447cb1c9..c05b3efae 100644
--- a/server/codegen/server.store.cue
+++ b/server/codegen/server.store.cue
@@ -3,8 +3,8 @@ package codegen
 import (
 	"strings"
 	"list"
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 
@@ -195,7 +195,7 @@ _payload: {
 	imports: {
 		// per-component type imports
 		for cmp in app.corteza.components for res in cmp.resources if res.store != _|_ {
-			"github.com/cortezaproject/corteza-server/\(cmp.ident)/types": "\(cmp.ident)Type"
+			"github.com/cortezaproject/corteza/server/\(cmp.ident)/types": "\(cmp.ident)Type"
 		}
 
 		for res in app.corteza.resources if res.store != _|_ {
diff --git a/server/codegen/server.types.cue b/server/codegen/server.types.cue
index 0dd25e41a..781251b2f 100644
--- a/server/codegen/server.types.cue
+++ b/server/codegen/server.types.cue
@@ -1,8 +1,8 @@
 package codegen
 
 import (
-	"github.com/cortezaproject/corteza-server/app"
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/app"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 [...schema.#codegen] &
diff --git a/server/compose/attachment.cue b/server/compose/attachment.cue
index 7cf47e799..8b6acb2da 100644
--- a/server/compose/attachment.cue
+++ b/server/compose/attachment.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 attachment: {
diff --git a/server/compose/automation/attachment_handler.yaml b/server/compose/automation/attachment_handler.yaml
index d2cb00086..76c6423e6 100644
--- a/server/compose/automation/attachment_handler.yaml
+++ b/server/compose/automation/attachment_handler.yaml
@@ -3,7 +3,7 @@
 #       from system & compose components into one single service
 
 imports:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
   - io
 
 labels: &labels
diff --git a/server/compose/automation/expr_types.yaml b/server/compose/automation/expr_types.yaml
index 488835a6c..2e2b8793f 100644
--- a/server/compose/automation/expr_types.yaml
+++ b/server/compose/automation/expr_types.yaml
@@ -1,6 +1,6 @@
 package: automation
 imports:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 types:
   ComposeNamespace:
diff --git a/server/compose/automation/modules_handler.yaml b/server/compose/automation/modules_handler.yaml
index ef710f2c2..7cae34651 100644
--- a/server/compose/automation/modules_handler.yaml
+++ b/server/compose/automation/modules_handler.yaml
@@ -1,7 +1,7 @@
 prefix: compose
 
 imports:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 params:
   moduleLookup: &moduleLookup
diff --git a/server/compose/automation/namespaces_handler.yaml b/server/compose/automation/namespaces_handler.yaml
index f1215199e..3d8cdc983 100644
--- a/server/compose/automation/namespaces_handler.yaml
+++ b/server/compose/automation/namespaces_handler.yaml
@@ -1,7 +1,7 @@
 prefix: compose
 
 imports:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 params:
   namespaceLookup: &namespaceLookup
diff --git a/server/compose/automation/records_handler.yaml b/server/compose/automation/records_handler.yaml
index efccbe895..acf364014 100644
--- a/server/compose/automation/records_handler.yaml
+++ b/server/compose/automation/records_handler.yaml
@@ -1,7 +1,7 @@
 prefix: compose
 
 imports:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 params:
   moduleLookup: &moduleLookup
diff --git a/server/compose/chart.cue b/server/compose/chart.cue
index 335983e41..9cabb96ba 100644
--- a/server/compose/chart.cue
+++ b/server/compose/chart.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 chart: {
diff --git a/server/compose/component.cue b/server/compose/component.cue
index d67b59da5..5cdd53d62 100644
--- a/server/compose/component.cue
+++ b/server/compose/component.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 component: schema.#component & {
diff --git a/server/compose/module.cue b/server/compose/module.cue
index 2e8a986c9..561a830c1 100644
--- a/server/compose/module.cue
+++ b/server/compose/module.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 module: {
diff --git a/server/compose/module_field.cue b/server/compose/module_field.cue
index c5ecd4820..c80ce0fea 100644
--- a/server/compose/module_field.cue
+++ b/server/compose/module_field.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 moduleField: {
diff --git a/server/compose/namespace.cue b/server/compose/namespace.cue
index c46706fc2..83a8a57f6 100644
--- a/server/compose/namespace.cue
+++ b/server/compose/namespace.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 namespace: {
diff --git a/server/compose/page.cue b/server/compose/page.cue
index 5f330a990..6f35f1dd8 100644
--- a/server/compose/page.cue
+++ b/server/compose/page.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 page: {
diff --git a/server/compose/record.cue b/server/compose/record.cue
index f2bf9f142..06cc7e77e 100644
--- a/server/compose/record.cue
+++ b/server/compose/record.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 record: {
diff --git a/server/compose/record_revision.cue b/server/compose/record_revision.cue
index f294483d2..be56f16dd 100644
--- a/server/compose/record_revision.cue
+++ b/server/compose/record_revision.cue
@@ -1,7 +1,7 @@
 package compose
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 record_revision: {
diff --git a/server/compose/rest.yaml b/server/compose/rest.yaml
index d26214be0..80be98ae3 100644
--- a/server/compose/rest.yaml
+++ b/server/compose/rest.yaml
@@ -11,8 +11,8 @@ endpoints:
   path: "/namespace"
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/label
-    - github.com/cortezaproject/corteza-server/pkg/locale
+    - github.com/cortezaproject/corteza/server/pkg/label
+    - github.com/cortezaproject/corteza/server/pkg/locale
     - sqlxTypes github.com/jmoiron/sqlx/types
     - time
   apis:
@@ -255,8 +255,8 @@ endpoints:
   authentication: []
   imports:
     - sqlxTypes github.com/jmoiron/sqlx/types
-    - github.com/cortezaproject/corteza-server/pkg/locale
-    - github.com/cortezaproject/corteza-server/pkg/label
+    - github.com/cortezaproject/corteza/server/pkg/locale
+    - github.com/cortezaproject/corteza/server/pkg/label
   parameters:
     path:
     - type: uint64
@@ -509,9 +509,9 @@ endpoints:
       title: Namespace ID
   imports:
     - sqlxTypes github.com/jmoiron/sqlx/types
-    - github.com/cortezaproject/corteza-server/compose/types
-    - github.com/cortezaproject/corteza-server/pkg/locale
-    - github.com/cortezaproject/corteza-server/pkg/label
+    - github.com/cortezaproject/corteza/server/compose/types
+    - github.com/cortezaproject/corteza/server/pkg/locale
+    - github.com/cortezaproject/corteza/server/pkg/label
     - time
   apis:
   - name: list
@@ -649,7 +649,7 @@ endpoints:
   path: "/namespace/{namespaceID}/module/{moduleID}/record"
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/compose/types
+    - github.com/cortezaproject/corteza/server/compose/types
   parameters:
     path:
     - type: uint64
@@ -918,8 +918,8 @@ endpoints:
   authentication: []
   imports:
     - sqlxTypes github.com/jmoiron/sqlx/types
-    - github.com/cortezaproject/corteza-server/pkg/label
-    - github.com/cortezaproject/corteza-server/pkg/locale
+    - github.com/cortezaproject/corteza/server/pkg/label
+    - github.com/cortezaproject/corteza/server/pkg/locale
     - time
   parameters:
     path:
@@ -1209,7 +1209,7 @@ endpoints:
   - Client ID
   - Session ID
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/rbac
+    - github.com/cortezaproject/corteza/server/pkg/rbac
   apis:
   - name: list
     path: "/"
diff --git a/server/compose/service/access_control_actions.yaml b/server/compose/service/access_control_actions.yaml
index 8a31e069a..7a96eeaa3 100644
--- a/server/compose/service/access_control_actions.yaml
+++ b/server/compose/service/access_control_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/pkg/rbac
+  - github.com/cortezaproject/corteza/server/pkg/rbac
 
 props:
   - name: rule
diff --git a/server/compose/service/attachment_actions.yaml b/server/compose/service/attachment_actions.yaml
index aa0fc426f..7f36a49b0 100644
--- a/server/compose/service/attachment_actions.yaml
+++ b/server/compose/service/attachment_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 props:
   - name: size
diff --git a/server/compose/service/chart_actions.yaml b/server/compose/service/chart_actions.yaml
index b46b8ab42..a3e0bedc9 100644
--- a/server/compose/service/chart_actions.yaml
+++ b/server/compose/service/chart_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 props:
   - name: chart
diff --git a/server/compose/service/module_actions.yaml b/server/compose/service/module_actions.yaml
index 09492a6ff..01e037fa7 100644
--- a/server/compose/service/module_actions.yaml
+++ b/server/compose/service/module_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 props:
   - name: module
diff --git a/server/compose/service/namespace_actions.yaml b/server/compose/service/namespace_actions.yaml
index 6675812b2..f111f0db3 100644
--- a/server/compose/service/namespace_actions.yaml
+++ b/server/compose/service/namespace_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 props:
   - name: namespace
diff --git a/server/compose/service/notifications_actions.yaml b/server/compose/service/notifications_actions.yaml
index 15c8e2188..a1db0f157 100644
--- a/server/compose/service/notifications_actions.yaml
+++ b/server/compose/service/notifications_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: info
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 props:
   - name: mail
diff --git a/server/compose/service/page_actions.yaml b/server/compose/service/page_actions.yaml
index 3429abb2c..19d0910f0 100644
--- a/server/compose/service/page_actions.yaml
+++ b/server/compose/service/page_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 props:
   - name: page
diff --git a/server/compose/service/record_actions.yaml b/server/compose/service/record_actions.yaml
index 46b90fea8..9b6817f80 100644
--- a/server/compose/service/record_actions.yaml
+++ b/server/compose/service/record_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza/server/compose/types
 
 props:
   - name: record
diff --git a/server/cue.mod/module.cue b/server/cue.mod/module.cue
index 921718396..0d07c6a94 100644
--- a/server/cue.mod/module.cue
+++ b/server/cue.mod/module.cue
@@ -1 +1 @@
-module: "github.com/cortezaproject/corteza-server"
+module: "github.com/cortezaproject/corteza/server"
diff --git a/server/cue.mods b/server/cue.mods
index e3e715219..b59bd4d75 100644
--- a/server/cue.mods
+++ b/server/cue.mods
@@ -1,3 +1,3 @@
-module github.com/cortezaproject/corteza-server
+module github.com/cortezaproject/corteza/server
 
 cue v0.4.0
diff --git a/server/federation/component.cue b/server/federation/component.cue
index c7f775fae..b93a809d8 100644
--- a/server/federation/component.cue
+++ b/server/federation/component.cue
@@ -1,7 +1,7 @@
 package federation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 component: schema.#component & {
diff --git a/server/federation/module_exposed.cue b/server/federation/module_exposed.cue
index 6a29104b1..0c9b7838b 100644
--- a/server/federation/module_exposed.cue
+++ b/server/federation/module_exposed.cue
@@ -1,7 +1,7 @@
 package federation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 exposedModule: {
diff --git a/server/federation/node.cue b/server/federation/node.cue
index 34bffdcf6..9b028a7e3 100644
--- a/server/federation/node.cue
+++ b/server/federation/node.cue
@@ -1,7 +1,7 @@
 package federation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 node: {
diff --git a/server/federation/node_sync.cue b/server/federation/node_sync.cue
index fa5375b16..964310208 100644
--- a/server/federation/node_sync.cue
+++ b/server/federation/node_sync.cue
@@ -1,7 +1,7 @@
 package federation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 nodeSync: {
diff --git a/server/federation/rest.yaml b/server/federation/rest.yaml
index 87524b947..d86ec7daf 100644
--- a/server/federation/rest.yaml
+++ b/server/federation/rest.yaml
@@ -148,7 +148,7 @@ endpoints:
     path: "/nodes/{nodeID}/modules"
     authentication: []
     imports:
-      - github.com/cortezaproject/corteza-server/federation/types
+      - github.com/cortezaproject/corteza/server/federation/types
     apis:
       - name: readExposed
         method: GET
@@ -503,7 +503,7 @@ endpoints:
     - Client ID
     - Session ID
     imports:
-      - github.com/cortezaproject/corteza-server/pkg/rbac
+      - github.com/cortezaproject/corteza/server/pkg/rbac
     apis:
     - name: list
       path: "/"
diff --git a/server/federation/service/access_control_actions.yaml b/server/federation/service/access_control_actions.yaml
index b52287efe..fc013ea20 100644
--- a/server/federation/service/access_control_actions.yaml
+++ b/server/federation/service/access_control_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/pkg/rbac
+  - github.com/cortezaproject/corteza/server/pkg/rbac
 
 props:
   - name: rule
diff --git a/server/federation/service/exposed_module_actions.yaml b/server/federation/service/exposed_module_actions.yaml
index 0495ec57e..23f9a2f68 100644
--- a/server/federation/service/exposed_module_actions.yaml
+++ b/server/federation/service/exposed_module_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/federation/types
+  - github.com/cortezaproject/corteza/server/federation/types
 
 props:
   - name: module
diff --git a/server/federation/service/module_mapping_actions.yaml b/server/federation/service/module_mapping_actions.yaml
index da12c369c..aa50b7a6d 100644
--- a/server/federation/service/module_mapping_actions.yaml
+++ b/server/federation/service/module_mapping_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/federation/types
+  - github.com/cortezaproject/corteza/server/federation/types
 
 props:
   - name: created
diff --git a/server/federation/service/node_actions.yaml b/server/federation/service/node_actions.yaml
index 434f003a0..91ca2b05f 100644
--- a/server/federation/service/node_actions.yaml
+++ b/server/federation/service/node_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/federation/types
+  - github.com/cortezaproject/corteza/server/federation/types
 
 props:
   - name: node
diff --git a/server/federation/service/node_sync_actions.yaml b/server/federation/service/node_sync_actions.yaml
index 503bdd147..bd741e276 100644
--- a/server/federation/service/node_sync_actions.yaml
+++ b/server/federation/service/node_sync_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/federation/types
+  - github.com/cortezaproject/corteza/server/federation/types
 
 props:
   - name: nodeSync
diff --git a/server/federation/service/shared_module_actions.yaml b/server/federation/service/shared_module_actions.yaml
index 14fdd0889..9c5a10ab2 100644
--- a/server/federation/service/shared_module_actions.yaml
+++ b/server/federation/service/shared_module_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/federation/types
+  - github.com/cortezaproject/corteza/server/federation/types
 
 props:
   - name: module
diff --git a/server/federation/shared_module.cue b/server/federation/shared_module.cue
index 20dd7b642..09e56c464 100644
--- a/server/federation/shared_module.cue
+++ b/server/federation/shared_module.cue
@@ -1,7 +1,7 @@
 package federation
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 sharedModule: {
diff --git a/server/pkg/codegen/assets/actions.gen.go.tpl b/server/pkg/codegen/assets/actions.gen.go.tpl
index 628cdeacd..cab6ddb05 100644
--- a/server/pkg/codegen/assets/actions.gen.go.tpl
+++ b/server/pkg/codegen/assets/actions.gen.go.tpl
@@ -11,9 +11,9 @@ package {{ .Package }}
 import (
 	"context"
 	"fmt"
-	"github.com/cortezaproject/corteza-server/pkg/actionlog"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
 {{- range .Import }}
     {{ normalizeImport . }}
 {{- end }}
diff --git a/server/pkg/codegen/assets/afunc.gen.go.tpl b/server/pkg/codegen/assets/afunc.gen.go.tpl
index c765683b6..ab90a4279 100644
--- a/server/pkg/codegen/assets/afunc.gen.go.tpl
+++ b/server/pkg/codegen/assets/afunc.gen.go.tpl
@@ -9,10 +9,10 @@ package {{ .Package }}
 // {{ .Source }}
 
 import (
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
 	"context"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
 {{- range .Imports }}
   {{ normalizeImport . }}
 {{- end }}
diff --git a/server/pkg/codegen/assets/events.gen.go.tpl b/server/pkg/codegen/assets/events.gen.go.tpl
index 196924423..d2f84ac42 100644
--- a/server/pkg/codegen/assets/events.gen.go.tpl
+++ b/server/pkg/codegen/assets/events.gen.go.tpl
@@ -13,7 +13,7 @@ import (
 {{- range .Imports }}
   {{ normalizeImport . }}
 {{- end }}
-	"github.com/cortezaproject/corteza-server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
 )
 
 // dummy placing to simplify import generation logic
diff --git a/server/pkg/codegen/assets/events.go.tpl b/server/pkg/codegen/assets/events.go.tpl
index 31635cd3d..758f3f88c 100644
--- a/server/pkg/codegen/assets/events.go.tpl
+++ b/server/pkg/codegen/assets/events.go.tpl
@@ -1,7 +1,7 @@
 package {{ .Package }}
 
 import (
-    "github.com/cortezaproject/corteza-server/pkg/eventbus"
+    "github.com/cortezaproject/corteza/server/pkg/eventbus"
 )
 
 var _=eventbus.ConstraintMaker
diff --git a/server/pkg/codegen/assets/expr_types.gen.go.tpl b/server/pkg/codegen/assets/expr_types.gen.go.tpl
index f5cfac6d1..4e5cc2b8d 100644
--- a/server/pkg/codegen/assets/expr_types.gen.go.tpl
+++ b/server/pkg/codegen/assets/expr_types.gen.go.tpl
@@ -16,7 +16,7 @@ import (
   {{ normalizeImport . }}
 {{- end }}
 {{- if ne .Package "expr" }}
-	. "github.com/cortezaproject/corteza-server/pkg/expr"
+	. "github.com/cortezaproject/corteza/server/pkg/expr"
 {{- end }}
 )
 
diff --git a/server/pkg/codegen/assets/rest_handler.go.tpl b/server/pkg/codegen/assets/rest_handler.go.tpl
index bf2a56edf..feb92cd1e 100644
--- a/server/pkg/codegen/assets/rest_handler.go.tpl
+++ b/server/pkg/codegen/assets/rest_handler.go.tpl
@@ -12,8 +12,8 @@ import (
 	"context"
 	"net/http"
 	"github.com/go-chi/chi/v5"
-	"github.com/cortezaproject/corteza-server/{{ .App }}/rest/request"
-	"github.com/cortezaproject/corteza-server/pkg/api"
+	"github.com/cortezaproject/corteza/server/{{ .App }}/rest/request"
+	"github.com/cortezaproject/corteza/server/pkg/api"
 )
 
 type (
diff --git a/server/pkg/codegen/assets/rest_request.go.tpl b/server/pkg/codegen/assets/rest_request.go.tpl
index f41a133af..df40d80ee 100644
--- a/server/pkg/codegen/assets/rest_request.go.tpl
+++ b/server/pkg/codegen/assets/rest_request.go.tpl
@@ -10,7 +10,7 @@ package request
 
 import (
 	"encoding/json"
-	"github.com/cortezaproject/corteza-server/pkg/payload"
+	"github.com/cortezaproject/corteza/server/pkg/payload"
 	"github.com/go-chi/chi/v5"
 	"io"
 	"fmt"
diff --git a/server/pkg/expr/expr_types.yaml b/server/pkg/expr/expr_types.yaml
index 4c2ee09c0..416aad07d 100644
--- a/server/pkg/expr/expr_types.yaml
+++ b/server/pkg/expr/expr_types.yaml
@@ -2,7 +2,7 @@ package: expr
 imports:
   - io
   - time
-  - github.com/cortezaproject/corteza-server/pkg/http
+  - github.com/cortezaproject/corteza/server/pkg/http
   - net/url
 
 types:
diff --git a/server/system/apigw_filter.cue b/server/system/apigw_filter.cue
index 839072d0b..e17109f76 100644
--- a/server/system/apigw_filter.cue
+++ b/server/system/apigw_filter.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 apigw_filter: {
diff --git a/server/system/apigw_route.cue b/server/system/apigw_route.cue
index 6df0ece76..5c7248115 100644
--- a/server/system/apigw_route.cue
+++ b/server/system/apigw_route.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 apigw_route: {
diff --git a/server/system/application.cue b/server/system/application.cue
index ab9a10c3d..72f58dc45 100644
--- a/server/system/application.cue
+++ b/server/system/application.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 application: {
diff --git a/server/system/attachment.cue b/server/system/attachment.cue
index 72f0477d8..0fc22a0b0 100644
--- a/server/system/attachment.cue
+++ b/server/system/attachment.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 attachment: {
diff --git a/server/system/auth_client.cue b/server/system/auth_client.cue
index 4d1168291..dbdaea264 100644
--- a/server/system/auth_client.cue
+++ b/server/system/auth_client.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 auth_client: {
diff --git a/server/system/auth_confirmed_client.cue b/server/system/auth_confirmed_client.cue
index ec1724ea3..8a4a3d7d9 100644
--- a/server/system/auth_confirmed_client.cue
+++ b/server/system/auth_confirmed_client.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 auth_confirmed_client: {
diff --git a/server/system/auth_oa2token.cue b/server/system/auth_oa2token.cue
index 650de1c70..55205f7c6 100644
--- a/server/system/auth_oa2token.cue
+++ b/server/system/auth_oa2token.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 auth_oa2token: {
diff --git a/server/system/auth_session.cue b/server/system/auth_session.cue
index 0de6a66f0..3bfc0805c 100644
--- a/server/system/auth_session.cue
+++ b/server/system/auth_session.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 auth_session: {
diff --git a/server/system/automation/actionlog_handler.yaml b/server/system/automation/actionlog_handler.yaml
index 002b12678..ab7f72887 100644
--- a/server/system/automation/actionlog_handler.yaml
+++ b/server/system/automation/actionlog_handler.yaml
@@ -1,6 +1,6 @@
 imports:
   - time
-  - github.com/cortezaproject/corteza-server/pkg/actionlog
+  - github.com/cortezaproject/corteza/server/pkg/actionlog
 
 snippets:
   filterParams: &filterParams
diff --git a/server/system/automation/expr_types.yaml b/server/system/automation/expr_types.yaml
index c768d0334..afe53f549 100644
--- a/server/system/automation/expr_types.yaml
+++ b/server/system/automation/expr_types.yaml
@@ -1,8 +1,8 @@
 package: automation
 imports:
-  - github.com/cortezaproject/corteza-server/system/types
-  - github.com/cortezaproject/corteza-server/pkg/rbac
-  - github.com/cortezaproject/corteza-server/pkg/actionlog
+  - github.com/cortezaproject/corteza/server/system/types
+  - github.com/cortezaproject/corteza/server/pkg/rbac
+  - github.com/cortezaproject/corteza/server/pkg/actionlog
 
 types:
   Template:
diff --git a/server/system/automation/rbac_handler.yaml b/server/system/automation/rbac_handler.yaml
index 3f8420af7..dbda5706c 100644
--- a/server/system/automation/rbac_handler.yaml
+++ b/server/system/automation/rbac_handler.yaml
@@ -1,6 +1,6 @@
 imports:
-  - github.com/cortezaproject/corteza-server/system/types
-  - github.com/cortezaproject/corteza-server/pkg/rbac
+  - github.com/cortezaproject/corteza/server/system/types
+  - github.com/cortezaproject/corteza/server/pkg/rbac
 
 params:
   manageParams: &manageParams
diff --git a/server/system/automation/roles_handler.yaml b/server/system/automation/roles_handler.yaml
index 648748a57..714ab49af 100644
--- a/server/system/automation/roles_handler.yaml
+++ b/server/system/automation/roles_handler.yaml
@@ -1,5 +1,5 @@
 imports:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 params:
   lookup: &lookup
diff --git a/server/system/automation/templates_handler.yaml b/server/system/automation/templates_handler.yaml
index 58d0874a4..aae50b0c7 100644
--- a/server/system/automation/templates_handler.yaml
+++ b/server/system/automation/templates_handler.yaml
@@ -1,5 +1,5 @@
 imports:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 snippets:
   lookup: &lookup
diff --git a/server/system/automation/users_handler.yaml b/server/system/automation/users_handler.yaml
index b72576a28..222d3fdda 100644
--- a/server/system/automation/users_handler.yaml
+++ b/server/system/automation/users_handler.yaml
@@ -1,5 +1,5 @@
 imports:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 snippets:
   lookup: &lookup
diff --git a/server/system/component.cue b/server/system/component.cue
index 1c84a3fa5..dc1949c59 100644
--- a/server/system/component.cue
+++ b/server/system/component.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 component: schema.#component & {
diff --git a/server/system/credential.cue b/server/system/credential.cue
index 78fc10679..821a53768 100644
--- a/server/system/credential.cue
+++ b/server/system/credential.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 credential: {
diff --git a/server/system/dal_connection.cue b/server/system/dal_connection.cue
index b86e4cbf4..b59d5c7fe 100644
--- a/server/system/dal_connection.cue
+++ b/server/system/dal_connection.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 dal_connection: {
diff --git a/server/system/dal_sensitivity_level.cue b/server/system/dal_sensitivity_level.cue
index 2cbcc774a..b918b0a43 100644
--- a/server/system/dal_sensitivity_level.cue
+++ b/server/system/dal_sensitivity_level.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 dal_sensitivity_level: {
diff --git a/server/system/data_privacy_request.cue b/server/system/data_privacy_request.cue
index 0703dfda0..821f1da72 100644
--- a/server/system/data_privacy_request.cue
+++ b/server/system/data_privacy_request.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 data_privacy_request: {
diff --git a/server/system/data_privacy_request_comment.cue b/server/system/data_privacy_request_comment.cue
index 7724f7266..1da7d6155 100644
--- a/server/system/data_privacy_request_comment.cue
+++ b/server/system/data_privacy_request_comment.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 data_privacy_request_comment: {
diff --git a/server/system/queue.cue b/server/system/queue.cue
index 20c2111a0..2da1b5f40 100644
--- a/server/system/queue.cue
+++ b/server/system/queue.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 queue: {
diff --git a/server/system/queue_message.cue b/server/system/queue_message.cue
index f8af056e5..533328629 100644
--- a/server/system/queue_message.cue
+++ b/server/system/queue_message.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 queue_message: {
diff --git a/server/system/reminder.cue b/server/system/reminder.cue
index 7ecaab3ea..e8460f84c 100644
--- a/server/system/reminder.cue
+++ b/server/system/reminder.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 reminder: {
diff --git a/server/system/report.cue b/server/system/report.cue
index 4f18fd567..98648d724 100644
--- a/server/system/report.cue
+++ b/server/system/report.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 report: {
diff --git a/server/system/resource_translation.cue b/server/system/resource_translation.cue
index 70a070a98..a8326165f 100644
--- a/server/system/resource_translation.cue
+++ b/server/system/resource_translation.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 resource_translation: {
diff --git a/server/system/rest.yaml b/server/system/rest.yaml
index a1632a5b0..51d0cf6b7 100644
--- a/server/system/rest.yaml
+++ b/server/system/rest.yaml
@@ -26,8 +26,8 @@ endpoints:
   entrypoint: authClient
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/label
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/pkg/label
+    - github.com/cortezaproject/corteza/server/system/types
     - time
   apis:
   - name: list
@@ -155,7 +155,7 @@ endpoints:
   entrypoint: settings
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/system/types
   apis:
   - name: list
     method: GET
@@ -221,8 +221,8 @@ endpoints:
   - Client ID
   - Session ID
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/label
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/pkg/label
+    - github.com/cortezaproject/corteza/server/system/types
   apis:
   - name: list
     method: GET
@@ -422,8 +422,8 @@ endpoints:
   - Client ID
   - Session ID
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/label
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/pkg/label
+    - github.com/cortezaproject/corteza/server/system/types
   apis:
   - name: list
     method: GET
@@ -759,7 +759,7 @@ endpoints:
   - Client ID
   - Session ID
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/system/types
   apis:
   - name: list
     method: GET
@@ -842,7 +842,7 @@ endpoints:
   - Client ID
   - Session ID
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/system/types
   apis:
   - name: list
     method: GET
@@ -912,7 +912,7 @@ endpoints:
   entrypoint: application
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/label
+    - github.com/cortezaproject/corteza/server/pkg/label
     - sqlxTypes github.com/jmoiron/sqlx/types
   apis:
   - name: list
@@ -1144,7 +1144,7 @@ endpoints:
   - Client ID
   - Session ID
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/rbac
+    - github.com/cortezaproject/corteza/server/pkg/rbac
   apis:
   - name: list
     path: "/"
@@ -1447,8 +1447,8 @@ endpoints:
   path: "/template"
   entrypoint: template
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
-    - github.com/cortezaproject/corteza-server/pkg/label
+    - github.com/cortezaproject/corteza/server/system/types
+    - github.com/cortezaproject/corteza/server/pkg/label
   authentication:
   - Client ID
   - SessionID
@@ -1631,9 +1631,9 @@ endpoints:
   entrypoint: report
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/label
-    - github.com/cortezaproject/corteza-server/system/types
-    - github.com/cortezaproject/corteza-server/system/reporting
+    - github.com/cortezaproject/corteza/server/pkg/label
+    - github.com/cortezaproject/corteza/server/system/types
+    - github.com/cortezaproject/corteza/server/system/reporting
   apis:
   - name: list
     method: GET
@@ -1863,7 +1863,7 @@ endpoints:
   entrypoint: queues
   path: "/queues"
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/system/types
   apis:
   - name: list
     method: GET
@@ -1924,8 +1924,8 @@ endpoints:
   entrypoint: apigwRoute
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
-    - github.com/cortezaproject/corteza-server/pkg/label
+    - github.com/cortezaproject/corteza/server/system/types
+    - github.com/cortezaproject/corteza/server/pkg/label
   apis:
   - name: list
     method: GET
@@ -1986,7 +1986,7 @@ endpoints:
   entrypoint: apigwFilter
   authentication: []
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/system/types
   apis:
   - name: list
     method: GET
@@ -2163,7 +2163,7 @@ endpoints:
 - title: Data Privacy Request
   entrypoint: dataPrivacyRequest
   imports:
-    - github.com/cortezaproject/corteza-server/system/types
+    - github.com/cortezaproject/corteza/server/system/types
   path: "/data-privacy/requests"
   apis:
     - name: list
@@ -2231,7 +2231,7 @@ endpoints:
 - title: Data Privacy
   entrypoint: dataPrivacy
   imports:
-    - github.com/cortezaproject/corteza-server/pkg/filter
+    - github.com/cortezaproject/corteza/server/pkg/filter
   path: "/data-privacy"
   apis:
     - name: connection list
diff --git a/server/system/role.cue b/server/system/role.cue
index 880325420..8f0952f8d 100644
--- a/server/system/role.cue
+++ b/server/system/role.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 role: {
diff --git a/server/system/service/access_control_actions.yaml b/server/system/service/access_control_actions.yaml
index 495342999..fd845a111 100644
--- a/server/system/service/access_control_actions.yaml
+++ b/server/system/service/access_control_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/pkg/rbac
+  - github.com/cortezaproject/corteza/server/pkg/rbac
 
 props:
   - name: rule
diff --git a/server/system/service/apigw_filter_actions.yaml b/server/system/service/apigw_filter_actions.yaml
index bf6b8eeac..db1af29f7 100644
--- a/server/system/service/apigw_filter_actions.yaml
+++ b/server/system/service/apigw_filter_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: filter
diff --git a/server/system/service/apigw_route_actions.yaml b/server/system/service/apigw_route_actions.yaml
index 6891dc00a..49a8781bc 100644
--- a/server/system/service/apigw_route_actions.yaml
+++ b/server/system/service/apigw_route_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: route
diff --git a/server/system/service/application_actions.yaml b/server/system/service/application_actions.yaml
index 3fbafff64..380f08859 100644
--- a/server/system/service/application_actions.yaml
+++ b/server/system/service/application_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: application
diff --git a/server/system/service/attachment_actions.yaml b/server/system/service/attachment_actions.yaml
index 9a38116c3..5f9ddb91a 100644
--- a/server/system/service/attachment_actions.yaml
+++ b/server/system/service/attachment_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: size
diff --git a/server/system/service/auth_actions.yaml b/server/system/service/auth_actions.yaml
index 997be65e8..f5ef0aaf3 100644
--- a/server/system/service/auth_actions.yaml
+++ b/server/system/service/auth_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: email
diff --git a/server/system/service/auth_client_actions.yaml b/server/system/service/auth_client_actions.yaml
index 2bd863e19..e2ab6973d 100644
--- a/server/system/service/auth_client_actions.yaml
+++ b/server/system/service/auth_client_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: authClient
diff --git a/server/system/service/credentials_actions.yaml b/server/system/service/credentials_actions.yaml
index a68aa1a2b..e590b924b 100644
--- a/server/system/service/credentials_actions.yaml
+++ b/server/system/service/credentials_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: user
diff --git a/server/system/service/dal_connection_actions.yaml b/server/system/service/dal_connection_actions.yaml
index dfe743b6e..6fb6545f9 100644
--- a/server/system/service/dal_connection_actions.yaml
+++ b/server/system/service/dal_connection_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: connection
diff --git a/server/system/service/dal_sensitivity_level_actions.yaml b/server/system/service/dal_sensitivity_level_actions.yaml
index 5521a62c4..691e1b53d 100644
--- a/server/system/service/dal_sensitivity_level_actions.yaml
+++ b/server/system/service/dal_sensitivity_level_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: sensitivityLevel
diff --git a/server/system/service/data_privacy_request_actions.yaml b/server/system/service/data_privacy_request_actions.yaml
index e7693ce9b..ecf3b2cfe 100644
--- a/server/system/service/data_privacy_request_actions.yaml
+++ b/server/system/service/data_privacy_request_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: dataPrivacyRequest
diff --git a/server/system/service/queue_actions.yaml b/server/system/service/queue_actions.yaml
index 2ace5b000..850f03572 100644
--- a/server/system/service/queue_actions.yaml
+++ b/server/system/service/queue_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: queue
diff --git a/server/system/service/reminder_actions.yaml b/server/system/service/reminder_actions.yaml
index 2e1f680ef..97bb143f5 100644
--- a/server/system/service/reminder_actions.yaml
+++ b/server/system/service/reminder_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: reminder
diff --git a/server/system/service/report_actions.yaml b/server/system/service/report_actions.yaml
index 5dd9475bd..b9511733b 100644
--- a/server/system/service/report_actions.yaml
+++ b/server/system/service/report_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: report
diff --git a/server/system/service/resource_translation_actions.yaml b/server/system/service/resource_translation_actions.yaml
index 333f9fc68..a89affdcd 100644
--- a/server/system/service/resource_translation_actions.yaml
+++ b/server/system/service/resource_translation_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: resourceTranslation
diff --git a/server/system/service/role_actions.yaml b/server/system/service/role_actions.yaml
index d71f20b5a..2c00db846 100644
--- a/server/system/service/role_actions.yaml
+++ b/server/system/service/role_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: member
diff --git a/server/system/service/setting_actions.yaml b/server/system/service/setting_actions.yaml
index 991b76949..070e4fda2 100644
--- a/server/system/service/setting_actions.yaml
+++ b/server/system/service/setting_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: settings
diff --git a/server/system/service/sink_actions.yaml b/server/system/service/sink_actions.yaml
index 4a31cb93c..0d3df9062 100644
--- a/server/system/service/sink_actions.yaml
+++ b/server/system/service/sink_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: url
diff --git a/server/system/service/template_actions.yaml b/server/system/service/template_actions.yaml
index 1a9f21900..db73ae055 100644
--- a/server/system/service/template_actions.yaml
+++ b/server/system/service/template_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: error
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: template
diff --git a/server/system/service/user_actions.yaml b/server/system/service/user_actions.yaml
index 3ac45f3c0..b84d23087 100644
--- a/server/system/service/user_actions.yaml
+++ b/server/system/service/user_actions.yaml
@@ -10,7 +10,7 @@ defaultActionSeverity: notice
 defaultErrorSeverity: alert
 
 import:
-  - github.com/cortezaproject/corteza-server/system/types
+  - github.com/cortezaproject/corteza/server/system/types
 
 props:
   - name: user
diff --git a/server/system/settings.cue b/server/system/settings.cue
index ef80bd144..96b2fd6fb 100644
--- a/server/system/settings.cue
+++ b/server/system/settings.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 settings: {
diff --git a/server/system/template.cue b/server/system/template.cue
index 9cb45d759..2ae309eff 100644
--- a/server/system/template.cue
+++ b/server/system/template.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 template: {
diff --git a/server/system/user.cue b/server/system/user.cue
index a34401b08..54ed067bc 100644
--- a/server/system/user.cue
+++ b/server/system/user.cue
@@ -1,7 +1,7 @@
 package system
 
 import (
-	"github.com/cortezaproject/corteza-server/codegen/schema"
+	"github.com/cortezaproject/corteza/server/codegen/schema"
 )
 
 user: {