Fix import paths in templates & generated go files

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 & {

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 & {

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 & {

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 & {

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 & {

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 & {

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 & {

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 & {

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"

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 & {

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 & {

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 & {

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 & {

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 & {

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: {

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 & {

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 & {

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 & {

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 & {

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 & {

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 & {

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 & {

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 & {

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"

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 & {

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 & {

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 & {

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 & {

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 & {

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"

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:

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

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 & {

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: "/"

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

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

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

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

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: {

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: {

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: {

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 }}

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 }}

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 }}

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"
 )
 

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 (

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 }}

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"
 )
 

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 }}

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 }}

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) {

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] &

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: {

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

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: [

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: [

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"
 )
 

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] &

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

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] &

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 != _|_ {

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] &

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: {

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

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:

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

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

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

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: {

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 & {

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: {

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: {

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: {

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: {

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: {

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: {

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: "/"

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

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

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

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

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

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

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

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

server/cue.mod/module.cue

@@ -1 +1 @@
-module: "github.com/cortezaproject/corteza-server"
+module: "github.com/cortezaproject/corteza/server"

server/cue.mods

@@ -1,3 +1,3 @@
-module github.com/cortezaproject/corteza-server
+module github.com/cortezaproject/corteza/server
 
 cue v0.4.0

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 & {

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: {

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: {

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: {

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: "/"

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

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

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

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

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

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

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: {

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 }}