Fix import paths (corteza-server => corteza/server)

aux/server-discovery/app/app.go

@@ -2,8 +2,8 @@ package app
 
 import (
 	"context"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/elastic/go-elasticsearch/v7/esutil"
 	"github.com/go-chi/chi/v5"

aux/server-discovery/app/boot_levels.go

@@ -3,10 +3,10 @@ package app
 import (
 	"context"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/indexer"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/auth"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/healthcheck"
-	"github.com/cortezaproject/corteza-server-discovery/searcher"
+	"github.com/cortezaproject/corteza/server-discovery/indexer"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/auth"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/healthcheck"
+	"github.com/cortezaproject/corteza/server-discovery/searcher"
 )
 
 const (

aux/server-discovery/app/servers.go

@@ -1,8 +1,8 @@
 package app
 
 import (
-	searcherRest "github.com/cortezaproject/corteza-server-discovery/searcher/rest"
-	"github.com/cortezaproject/corteza-server/pkg/options"
+	searcherRest "github.com/cortezaproject/corteza/server-discovery/searcher/rest"
+	"github.com/cortezaproject/corteza/server/pkg/options"
 	"github.com/go-chi/chi/v5"
 	"go.uber.org/zap"
 	"strings"

aux/server-discovery/indexer/service.go

@@ -3,11 +3,11 @@ package indexer
 import (
 	"context"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/api"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/es"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/es/mapping"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/es/reindex"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/api"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/es"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/es/mapping"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/es/reindex"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esutil"
 	"go.uber.org/zap"

aux/server-discovery/main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/cortezaproject/corteza-server-discovery/app"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/api/server"
-	"github.com/cortezaproject/corteza-server/pkg/cli"
+	"github.com/cortezaproject/corteza/server-discovery/app"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/api/server"
+	"github.com/cortezaproject/corteza/server/pkg/cli"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/elastic/go-elasticsearch/v7/esutil"
 	"sync"

aux/server-discovery/pkg/api/client.go

@@ -3,7 +3,7 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
 	"net/http"
 	"net/url"
 	"strings"

aux/server-discovery/pkg/api/server/handlers.go

@@ -1,11 +1,11 @@
 package server
 
 import (
-	"github.com/cortezaproject/corteza-server-discovery/pkg/auth"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/healthcheck"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
-	"github.com/cortezaproject/corteza-server/pkg/api"
-	"github.com/cortezaproject/corteza-server/pkg/version"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/auth"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/healthcheck"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/api"
+	"github.com/cortezaproject/corteza/server/pkg/version"
 	"github.com/go-chi/chi/v5"
 	"go.uber.org/zap"
 	"net/http"

aux/server-discovery/pkg/api/server/logger.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/cortezaproject/corteza-server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
 	"github.com/go-chi/chi/v5/middleware"
 	"go.uber.org/zap"
 	"net/http"

aux/server-discovery/pkg/api/server/middleware.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"runtime/debug"
 
-	"github.com/cortezaproject/corteza-server/pkg/api"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/api"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
 	"github.com/go-chi/chi/v5/middleware"
 	"go.uber.org/zap"
 )

aux/server-discovery/pkg/api/server/server.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
 	"github.com/go-chi/chi/v5"
 	"go.uber.org/zap"
 )

aux/server-discovery/pkg/auth/token_issuer.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/pkg/payload"
+	"github.com/cortezaproject/corteza/server/pkg/payload"
 	"github.com/go-oauth2/oauth2/v4"
 	"github.com/go-oauth2/oauth2/v4/generates"
 	"github.com/go-oauth2/oauth2/v4/models"

aux/server-discovery/pkg/auth/token_middleware.go

@@ -6,7 +6,7 @@ import (
 	"github.com/lestrrat-go/jwx/jwa"
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
 	"github.com/go-chi/jwtauth"
 	"github.com/lestrrat-go/jwx/jwk"
 	"github.com/lestrrat-go/jwx/jwt"

aux/server-discovery/pkg/es/es.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/elastic/go-elasticsearch/v7/esutil"

aux/server-discovery/pkg/es/mapping/mapping.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/es/reindex"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/es/reindex"
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/elastic/go-elasticsearch/v7/esutil"

aux/server-discovery/pkg/es/mapping/mapping_test.go

@@ -2,7 +2,7 @@ package mapping
 
 import (
 	"fmt"
-	"github.com/cortezaproject/corteza-server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/options"
 	"os"
 	"strings"
 	"testing"

aux/server-discovery/pkg/es/reindex/reindex.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esutil"

aux/server-discovery/pkg/options/corteza.go

@@ -2,7 +2,7 @@ package options
 
 import (
 	"fmt"
-	"github.com/cortezaproject/corteza-server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/options"
 )
 
 type (

aux/server-discovery/pkg/options/es.go

@@ -1,7 +1,7 @@
 package options
 
 import (
-	"github.com/cortezaproject/corteza-server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/options"
 	"strings"
 )
 

aux/server-discovery/pkg/options/indexer.go

@@ -2,7 +2,7 @@ package options
 
 import (
 	"fmt"
-	"github.com/cortezaproject/corteza-server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/options"
 	"os"
 	"strings"
 )

aux/server-discovery/pkg/options/searcher.go

@@ -2,7 +2,7 @@ package options
 
 import (
 	"fmt"
-	"github.com/cortezaproject/corteza-server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/options"
 	"os"
 	"strings"
 )

aux/server-discovery/searcher/rest/handlers/search.go

@@ -2,8 +2,8 @@ package handlers
 
 import (
 	"context"
-	"github.com/cortezaproject/corteza-server-discovery/searcher/rest/request"
-	"github.com/cortezaproject/corteza-server/pkg/api"
+	"github.com/cortezaproject/corteza/server-discovery/searcher/rest/request"
+	"github.com/cortezaproject/corteza/server/pkg/api"
 	"github.com/go-chi/chi/v5"
 	"net/http"
 )

aux/server-discovery/searcher/rest/request/request.go

@@ -1,7 +1,7 @@
 package request
 
 import (
-	"github.com/cortezaproject/corteza-server/pkg/payload"
+	"github.com/cortezaproject/corteza/server/pkg/payload"
 	"net/http"
 )
 

aux/server-discovery/searcher/rest/router.go

@@ -1,8 +1,8 @@
 package rest
 
 import (
-	"github.com/cortezaproject/corteza-server-discovery/pkg/auth"
-	"github.com/cortezaproject/corteza-server-discovery/searcher/rest/handlers"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/auth"
+	"github.com/cortezaproject/corteza/server-discovery/searcher/rest/handlers"
 	"github.com/go-chi/chi/v5"
 )
 

aux/server-discovery/searcher/rest/search.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/searcher"
-	"github.com/cortezaproject/corteza-server-discovery/searcher/rest/request"
+	"github.com/cortezaproject/corteza/server-discovery/searcher"
+	"github.com/cortezaproject/corteza/server-discovery/searcher/rest/request"
 	"github.com/jmoiron/sqlx/types"
 	"net/http"
 )

aux/server-discovery/searcher/service.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/api"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/es"
-	"github.com/cortezaproject/corteza-server-discovery/pkg/options"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/api"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/es"
+	"github.com/cortezaproject/corteza/server-discovery/pkg/options"
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/elastic/go-elasticsearch/v7/esutil"

server/app/app.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-oauth2/oauth2/v4"
 	"github.com/spf13/cobra"

server/app/boot_auth.go

@@ -3,13 +3,13 @@ package app
 import (
 	"context"
 	"fmt"
-	authHandlers "github.com/cortezaproject/corteza-server/auth/handlers"
-	"github.com/cortezaproject/corteza-server/auth/oauth2"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/id"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/types"
+	authHandlers "github.com/cortezaproject/corteza/server/auth/handlers"
+	"github.com/cortezaproject/corteza/server/auth/oauth2"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/id"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/lestrrat-go/jwx/jwa"
 	"github.com/lestrrat-go/jwx/jwk"
 	"github.com/lestrrat-go/jwx/jwt"

server/app/boot_auth_test.go

@@ -6,7 +6,7 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"github.com/cortezaproject/corteza-server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/options"
 	"github.com/lestrrat-go/jwx/jwa"
 	"github.com/stretchr/testify/require"
 	"testing"

server/app/boot_dal.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/pkg/dal"
-	"github.com/cortezaproject/corteza-server/pkg/id"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/dal"
+	"github.com/cortezaproject/corteza/server/pkg/id"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"go.uber.org/zap"
 )
 

server/app/boot_levels.go

@@ -9,41 +9,41 @@ import (
 	"strings"
 	"time"
 
-	authService "github.com/cortezaproject/corteza-server/auth"
-	"github.com/cortezaproject/corteza-server/auth/saml"
-	authSettings "github.com/cortezaproject/corteza-server/auth/settings"
-	autService "github.com/cortezaproject/corteza-server/automation/service"
-	cmpService "github.com/cortezaproject/corteza-server/compose/service"
-	cmpEvent "github.com/cortezaproject/corteza-server/compose/service/event"
-	discoveryService "github.com/cortezaproject/corteza-server/discovery/service"
-	fedService "github.com/cortezaproject/corteza-server/federation/service"
-	"github.com/cortezaproject/corteza-server/pkg/actionlog"
-	"github.com/cortezaproject/corteza-server/pkg/apigw"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/corredor"
-	"github.com/cortezaproject/corteza-server/pkg/dal"
-	"github.com/cortezaproject/corteza-server/pkg/eventbus"
-	"github.com/cortezaproject/corteza-server/pkg/healthcheck"
-	"github.com/cortezaproject/corteza-server/pkg/http"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
-	"github.com/cortezaproject/corteza-server/pkg/mail"
-	"github.com/cortezaproject/corteza-server/pkg/messagebus"
-	"github.com/cortezaproject/corteza-server/pkg/monitor"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/pkg/provision"
-	"github.com/cortezaproject/corteza-server/pkg/rbac"
-	"github.com/cortezaproject/corteza-server/pkg/scheduler"
-	"github.com/cortezaproject/corteza-server/pkg/seeder"
-	"github.com/cortezaproject/corteza-server/pkg/sentry"
-	"github.com/cortezaproject/corteza-server/pkg/valuestore"
-	"github.com/cortezaproject/corteza-server/pkg/version"
-	"github.com/cortezaproject/corteza-server/pkg/websocket"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/service"
-	sysService "github.com/cortezaproject/corteza-server/system/service"
-	sysEvent "github.com/cortezaproject/corteza-server/system/service/event"
-	"github.com/cortezaproject/corteza-server/system/types"
+	authService "github.com/cortezaproject/corteza/server/auth"
+	"github.com/cortezaproject/corteza/server/auth/saml"
+	authSettings "github.com/cortezaproject/corteza/server/auth/settings"
+	autService "github.com/cortezaproject/corteza/server/automation/service"
+	cmpService "github.com/cortezaproject/corteza/server/compose/service"
+	cmpEvent "github.com/cortezaproject/corteza/server/compose/service/event"
+	discoveryService "github.com/cortezaproject/corteza/server/discovery/service"
+	fedService "github.com/cortezaproject/corteza/server/federation/service"
+	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	"github.com/cortezaproject/corteza/server/pkg/apigw"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/corredor"
+	"github.com/cortezaproject/corteza/server/pkg/dal"
+	"github.com/cortezaproject/corteza/server/pkg/eventbus"
+	"github.com/cortezaproject/corteza/server/pkg/healthcheck"
+	"github.com/cortezaproject/corteza/server/pkg/http"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/mail"
+	"github.com/cortezaproject/corteza/server/pkg/messagebus"
+	"github.com/cortezaproject/corteza/server/pkg/monitor"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/provision"
+	"github.com/cortezaproject/corteza/server/pkg/rbac"
+	"github.com/cortezaproject/corteza/server/pkg/scheduler"
+	"github.com/cortezaproject/corteza/server/pkg/seeder"
+	"github.com/cortezaproject/corteza/server/pkg/sentry"
+	"github.com/cortezaproject/corteza/server/pkg/valuestore"
+	"github.com/cortezaproject/corteza/server/pkg/version"
+	"github.com/cortezaproject/corteza/server/pkg/websocket"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/service"
+	sysService "github.com/cortezaproject/corteza/server/system/service"
+	sysEvent "github.com/cortezaproject/corteza/server/system/service/event"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/lestrrat-go/jwx/jwt"
 	"go.uber.org/zap"
 	gomail "gopkg.in/mail.v2"

server/app/boot_levels_test.go

@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/external"
-	authSettings "github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/external"
+	authSettings "github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/require"
 )

server/app/cli.go

@@ -5,15 +5,15 @@ import (
 	"fmt"
 	"sync"
 
-	authCommands "github.com/cortezaproject/corteza-server/auth/commands"
-	federationCommands "github.com/cortezaproject/corteza-server/federation/commands"
-	"github.com/cortezaproject/corteza-server/pkg/actionlog"
-	"github.com/cortezaproject/corteza-server/pkg/api/server"
-	"github.com/cortezaproject/corteza-server/pkg/cli"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	fakerCommands "github.com/cortezaproject/corteza-server/pkg/seeder/commands"
-	"github.com/cortezaproject/corteza-server/store"
-	systemCommands "github.com/cortezaproject/corteza-server/system/commands"
+	authCommands "github.com/cortezaproject/corteza/server/auth/commands"
+	federationCommands "github.com/cortezaproject/corteza/server/federation/commands"
+	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	"github.com/cortezaproject/corteza/server/pkg/api/server"
+	"github.com/cortezaproject/corteza/server/pkg/cli"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	fakerCommands "github.com/cortezaproject/corteza/server/pkg/seeder/commands"
+	"github.com/cortezaproject/corteza/server/store"
+	systemCommands "github.com/cortezaproject/corteza/server/system/commands"
 	"go.uber.org/zap"
 )
 

server/app/servers.go

@@ -6,17 +6,17 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/cortezaproject/corteza-server/assets"
-	automationRest "github.com/cortezaproject/corteza-server/automation/rest"
-	composeRest "github.com/cortezaproject/corteza-server/compose/rest"
-	discoveryRest "github.com/cortezaproject/corteza-server/discovery/rest"
-	"github.com/cortezaproject/corteza-server/docs"
-	federationRest "github.com/cortezaproject/corteza-server/federation/rest"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/pkg/webapp"
-	systemRest "github.com/cortezaproject/corteza-server/system/rest"
-	"github.com/cortezaproject/corteza-server/system/scim"
+	"github.com/cortezaproject/corteza/server/assets"
+	automationRest "github.com/cortezaproject/corteza/server/automation/rest"
+	composeRest "github.com/cortezaproject/corteza/server/compose/rest"
+	discoveryRest "github.com/cortezaproject/corteza/server/discovery/rest"
+	"github.com/cortezaproject/corteza/server/docs"
+	federationRest "github.com/cortezaproject/corteza/server/federation/rest"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/webapp"
+	systemRest "github.com/cortezaproject/corteza/server/system/rest"
+	"github.com/cortezaproject/corteza/server/system/scim"
 	"github.com/go-chi/chi/v5"
 	"go.uber.org/zap"
 )

server/app/store.go

@@ -2,7 +2,7 @@ package app
 
 // Registers all supported store backends
 import (
-	_ "github.com/cortezaproject/corteza-server/store/adapters/rdbms/drivers/mysql"
-	_ "github.com/cortezaproject/corteza-server/store/adapters/rdbms/drivers/postgres"
-	_ "github.com/cortezaproject/corteza-server/store/adapters/rdbms/drivers/sqlite"
+	_ "github.com/cortezaproject/corteza/server/store/adapters/rdbms/drivers/mysql"
+	_ "github.com/cortezaproject/corteza/server/store/adapters/rdbms/drivers/postgres"
+	_ "github.com/cortezaproject/corteza/server/store/adapters/rdbms/drivers/sqlite"
 )

server/auth/auth.go

@@ -16,20 +16,20 @@ import (
 	"time"
 
 	"github.com/Masterminds/sprig"
-	"github.com/cortezaproject/corteza-server/auth/external"
-	"github.com/cortezaproject/corteza-server/auth/handlers"
-	"github.com/cortezaproject/corteza-server/auth/oauth2"
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/saml"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/pkg/actionlog"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/pkg/version"
-	"github.com/cortezaproject/corteza-server/store"
-	systemService "github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/external"
+	"github.com/cortezaproject/corteza/server/auth/handlers"
+	"github.com/cortezaproject/corteza/server/auth/oauth2"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/saml"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/version"
+	"github.com/cortezaproject/corteza/server/store"
+	systemService "github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-chi/chi/v5"
 	oauth2def "github.com/go-oauth2/oauth2/v4"
 	"go.uber.org/zap"

server/auth/client.go

@@ -3,10 +3,10 @@ package auth
 import (
 	"context"
 
-	"github.com/cortezaproject/corteza-server/pkg/handle"
-	"github.com/cortezaproject/corteza-server/store"
-	systemService "github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/handle"
+	"github.com/cortezaproject/corteza/server/store"
+	systemService "github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/spf13/cast"
 )
 

server/auth/commands/assets.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/cortezaproject/corteza-server/auth"
-	"github.com/cortezaproject/corteza-server/pkg/cli"
+	"github.com/cortezaproject/corteza/server/auth"
+	"github.com/cortezaproject/corteza/server/pkg/cli"
 	"github.com/spf13/cobra"
 )
 

server/auth/commands/commands.go

@@ -4,14 +4,14 @@ import (
 	"context"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/auth/external"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/cli"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/external"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/cli"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/spf13/cobra"
 )
 

server/auth/external/auth_handler.go

@@ -3,8 +3,8 @@ package external
 import (
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/auth/saml"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/saml"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/crewjam/saml/samlsp"
 	"github.com/markbates/goth/gothic"
 )

server/auth/external/external.go

@@ -6,7 +6,7 @@ import (
 )
 
 const (
-	OIDC_PROVIDER_PREFIX = "openid-connect." // must match const in "github.com/cortezaproject/corteza-server/system/types" app_settings.go
+	OIDC_PROVIDER_PREFIX = "openid-connect." // must match const in "github.com/cortezaproject/corteza/server/system/types" app_settings.go
 
 )
 

server/auth/external/goth.go

@@ -3,7 +3,7 @@ package external
 import (
 	"strings"
 
-	"github.com/cortezaproject/corteza-server/auth/settings"
+	"github.com/cortezaproject/corteza/server/auth/settings"
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/facebook"
 	"github.com/markbates/goth/providers/github"

server/auth/external/main_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
 )
 
 func TestMain(m *testing.M) {

server/auth/external/register.go

@@ -8,9 +8,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/crusttech/go-oidc"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"

server/auth/handlers/handle_authorized-clients.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/system/types"
 )
 
 type (

server/auth/handlers/handle_change-password.go

@@ -1,9 +1,9 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/system/service"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/system/service"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_change-password_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_create-password.go

@@ -1,10 +1,10 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_create-password_test.go

@@ -7,11 +7,11 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/system/service"
+	"github.com/cortezaproject/corteza/server/system/service"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_dev.go

@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/y7s"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/y7s"
 	"gopkg.in/yaml.v3"
 )
 

server/auth/handlers/handle_external.go

@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/cortezaproject/corteza-server/auth/external"
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/api"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/external"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/api"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-chi/chi/v5"
 	"go.uber.org/zap"
 )

server/auth/handlers/handle_login.go

@@ -3,11 +3,11 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_login_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_logout.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/request"
 	"github.com/markbates/goth/gothic"
 )
 

server/auth/handlers/handle_logout_test.go

@@ -5,10 +5,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_mfa.go

@@ -1,8 +1,8 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
 )
 
 // Handles MFA TOTP configuration form

server/auth/handlers/handle_mfa_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_mfa_totp.go

@@ -6,10 +6,10 @@ import (
 	"math/rand"
 	"net/url"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"go.uber.org/zap"
 	"rsc.io/qr"
 )

server/auth/handlers/handle_oauth2.go

@@ -19,12 +19,12 @@ import (
 	oauth2errors "github.com/go-oauth2/oauth2/v4/errors"
 	"github.com/lestrrat-go/jwx/jwt"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/pkg/payload"
-	systemService "github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/pkg/payload"
+	systemService "github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	oauth2def "github.com/go-oauth2/oauth2/v4"
 	"go.uber.org/zap"
 )

server/auth/handlers/handle_oauth2_test.go

@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/types"
 	oauth2models "github.com/go-oauth2/oauth2/v4/models"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

server/auth/handlers/handle_password-reset.go

@@ -1,10 +1,10 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_password-reset_test.go

@@ -7,10 +7,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_profile.go

@@ -1,9 +1,9 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_profile_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_saml.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/auth/external"
+	"github.com/cortezaproject/corteza/server/auth/external"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_security.go

@@ -1,7 +1,7 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/request"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_security_test.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handle_sessions.go

@@ -6,8 +6,8 @@ import (
 	"sort"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/system/types"
 )
 
 type (

server/auth/handlers/handle_signup.go

@@ -1,9 +1,9 @@
 package handlers
 
 import (
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"go.uber.org/zap"
 )
 

server/auth/handlers/handle_signup_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/stretchr/testify/require"
 )
 

server/auth/handlers/handler.go

@@ -10,14 +10,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/auth/external"
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/saml"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/external"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/saml"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-oauth2/oauth2/v4"
 	"github.com/go-oauth2/oauth2/v4/server"
 	"github.com/gorilla/csrf"

server/auth/handlers/mock_test.go

@@ -6,13 +6,13 @@ import (
 	"net/http/httptest"
 	"net/url"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-oauth2/oauth2/v4"
 	"github.com/go-oauth2/oauth2/v4/server"
 	"github.com/gorilla/sessions"

server/auth/handlers/routes.go

@@ -3,9 +3,9 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/pkg/actionlog"
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/locale"
+	"github.com/cortezaproject/corteza/server/pkg/actionlog"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/locale"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/httprate"
 	"github.com/gorilla/csrf"

server/auth/oauth2/client.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/cortezaproject/corteza-server/pkg/handle"
-	"github.com/cortezaproject/corteza-server/store"
-	systemService "github.com/cortezaproject/corteza-server/system/service"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/handle"
+	"github.com/cortezaproject/corteza/server/store"
+	systemService "github.com/cortezaproject/corteza/server/system/service"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-oauth2/oauth2/v4"
 	"github.com/go-oauth2/oauth2/v4/models"
 	"github.com/spf13/cast"

server/auth/oauth2/corteza_token_store.go

@@ -7,11 +7,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/errors"
-	"github.com/cortezaproject/corteza-server/pkg/id"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/errors"
+	"github.com/cortezaproject/corteza/server/pkg/id"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/go-oauth2/oauth2/v4"
 	oauth2errors "github.com/go-oauth2/oauth2/v4/errors"
 	oauth2models "github.com/go-oauth2/oauth2/v4/models"

server/auth/oauth2/oauth2.go

@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/cortezaproject/corteza-server/pkg/handle"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/pkg/payload"
+	"github.com/cortezaproject/corteza/server/pkg/handle"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/payload"
 	"github.com/go-oauth2/oauth2/v4"
 	"github.com/go-oauth2/oauth2/v4/errors"
 	"github.com/go-oauth2/oauth2/v4/manage"

server/auth/oauth2/user_authorizer.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/auth/request"
-	internalAuth "github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/payload"
+	"github.com/cortezaproject/corteza/server/auth/request"
+	internalAuth "github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/payload"
 	"github.com/go-oauth2/oauth2/v4/server"
 )
 

server/auth/request/auth_user.go

@@ -3,8 +3,8 @@ package request
 import (
 	"encoding/gob"
 
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/gorilla/sessions"
 )
 

server/auth/request/context.go

@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/gorilla/sessions"
 )
 

server/auth/request/corteza_session_store.go

@@ -9,11 +9,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/pkg/auth"
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/pkg/rand"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/auth"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/pkg/rand"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
 )

server/auth/request/manager.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/cortezaproject/corteza-server/pkg/options"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/options"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/gorilla/sessions"
 	"go.uber.org/zap"
 )

server/auth/request/session.go

@@ -3,7 +3,7 @@ package request
 import (
 	"net/url"
 
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/gorilla/sessions"
 )
 

server/auth/saml/saml.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/cortezaproject/corteza-server/auth/settings"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/auth/settings"
+	"github.com/cortezaproject/corteza/server/system/types"
 	"github.com/crewjam/saml"
 	"github.com/crewjam/saml/samlsp"
 )

server/auth/token.go

@@ -2,8 +2,8 @@ package auth
 
 import (
 	"context"
-	"github.com/cortezaproject/corteza-server/store"
-	"github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/store"
+	"github.com/cortezaproject/corteza/server/system/types"
 )
 
 type (

server/automation/automation/apigw_body_handler.gen.go

@@ -10,10 +10,10 @@ package automation
 
 import (
 	"context"
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/http"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/http"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
 )
 
 var _ wfexec.ExecResponse

server/automation/automation/corredor_handler.gen.go

@@ -10,9 +10,9 @@ package automation
 
 import (
 	"context"
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
 )
 
 var _ wfexec.ExecResponse

server/automation/automation/corredor_handler.go

@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/cortezaproject/corteza-server/pkg/corredor"
-	"github.com/cortezaproject/corteza-server/pkg/eventbus"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/system/service/event"
+	"github.com/cortezaproject/corteza/server/pkg/corredor"
+	"github.com/cortezaproject/corteza/server/pkg/eventbus"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/system/service/event"
 )
 
 type (

server/automation/automation/email_handler.gen.go

@@ -10,10 +10,10 @@ package automation
 
 import (
 	"context"
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
-	sysTypes "github.com/cortezaproject/corteza-server/system/types"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
+	sysTypes "github.com/cortezaproject/corteza/server/system/types"
 	"io"
 )
 

server/automation/automation/email_handler.go

@@ -7,8 +7,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/cortezaproject/corteza-server/pkg/mail"
-	sysTypes "github.com/cortezaproject/corteza-server/system/types"
+	"github.com/cortezaproject/corteza/server/pkg/mail"
+	sysTypes "github.com/cortezaproject/corteza/server/system/types"
 	gomail "gopkg.in/mail.v2"
 )
 

server/automation/automation/expr_types.gen.go

@@ -11,7 +11,7 @@ package automation
 import (
 	"context"
 	"fmt"
-	. "github.com/cortezaproject/corteza-server/pkg/expr"
+	. "github.com/cortezaproject/corteza/server/pkg/expr"
 	"sync"
 )
 

server/automation/automation/expr_types.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/http"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/http"
 	"gopkg.in/mail.v2"
 )
 

server/automation/automation/http_request_handler.gen.go

@@ -10,9 +10,9 @@ package automation
 
 import (
 	"context"
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
 	"io"
 	"net/http"
 	"net/url"

server/automation/automation/http_request_handler.go

@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/cortezaproject/corteza-server/pkg/version"
+	"github.com/cortezaproject/corteza/server/pkg/version"
 )
 
 type (

server/automation/automation/iterators.go

@@ -4,7 +4,7 @@ import (
 	"bufio"
 	"context"
 
-	. "github.com/cortezaproject/corteza-server/pkg/expr"
+	. "github.com/cortezaproject/corteza/server/pkg/expr"
 )
 
 type (

server/automation/automation/jsenv_handler.gen.go

@@ -10,9 +10,9 @@ package automation
 
 import (
 	"context"
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
 	"io"
 )
 

server/automation/automation/jsenv_handler.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/jsenv"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/jsenv"
 )
 
 type (

server/automation/automation/jsenv_handler_test.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	h "github.com/cortezaproject/corteza-server/pkg/http"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	h "github.com/cortezaproject/corteza/server/pkg/http"
 	"github.com/stretchr/testify/require"
 )
 

server/automation/automation/jwt_handler.gen.go

@@ -10,9 +10,9 @@ package automation
 
 import (
 	"context"
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
 	"io"
 )
 

server/automation/automation/jwt_handler_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/cortezaproject/corteza-server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
 	"github.com/stretchr/testify/require"
 )
 

server/automation/automation/log_handler.gen.go

@@ -10,9 +10,9 @@ package automation
 
 import (
 	"context"
-	atypes "github.com/cortezaproject/corteza-server/automation/types"
-	"github.com/cortezaproject/corteza-server/pkg/expr"
-	"github.com/cortezaproject/corteza-server/pkg/wfexec"
+	atypes "github.com/cortezaproject/corteza/server/automation/types"
+	"github.com/cortezaproject/corteza/server/pkg/expr"
+	"github.com/cortezaproject/corteza/server/pkg/wfexec"
 )
 
 var _ wfexec.ExecResponse

server/automation/automation/log_handler.go

@@ -3,7 +3,7 @@ package automation
 import (
 	"context"
 
-	"github.com/cortezaproject/corteza-server/pkg/logger"
+	"github.com/cortezaproject/corteza/server/pkg/logger"
 	"go.uber.org/zap"
 )