Repository: crc-org/crc
Pull request #3402 (2022-11-01 08:31:31)

Switch code-ready to crc-org

praveenkumar: /ok-to-test
praveenkumar: /test
openshift-ci[bot]: @praveenkumar: The `/test` command needs one or more targets.
The following commands are available to trigger required jobs:
* `/test e2e-crc`
* `/test images`
* `/test integration-crc`

Use `/test all` to run all jobs.


<details>

In response to [this](https://github.com/crc-org/crc/pull/3402#issuecomment-1298393612):

>/test


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>
praveenkumar: /test all

Patch:
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index d21354986..61ca44bc9 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -4,7 +4,7 @@
 [[filing-issues]]
 == Filing issues
 
-File issues using the standard link:https://github.com/code-ready/crc/issues[GitHub issue tracker] for the repository.
+File issues using the standard link:https://github.com/crc-org/crc/issues[GitHub issue tracker] for the repository.
 Before you submit a new issue, we recommend that you search the list of issues to see if anyone already submitted a similar issue.
 
 [[contributing-patches]]
diff --git a/Makefile b/Makefile
index 2922d3207..fed2df3d5 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ GOARCH ?= $(shell go env GOARCH)
 
 HOST_BUILD_DIR=$(BUILD_DIR)/$(GOOS)-$(GOARCH)
 GOPATH ?= $(shell go env GOPATH)
-ORG := github.com/code-ready
+ORG := github.com/crc-org
 REPOPATH ?= $(ORG)/crc
 PACKAGE_DIR := packaging/$(GOOS)
 
diff --git a/README.adoc b/README.adoc
index 05d133451..d74d5b814 100644
--- a/README.adoc
+++ b/README.adoc
@@ -6,11 +6,11 @@
 
 toc::[]
 
-image:https://github.com/code-ready/crc/actions/workflows/make-check.yml/badge.svg?branch=main["main", link="https://github.com/code-ready/crc/actions/workflows/make-check.yml"]
-image:https://github.com/code-ready/crc/actions/workflows/windows-installer.yml/badge.svg["win msi", link="https://github.com/code-ready/crc/actions/workflows/windows-installer.yml"]
-image:https://github.com/code-ready/crc/actions/workflows/macos-installer.yml/badge.svg["macos pkg", link="https://github.com/code-ready/crc/actions/workflows/macos-installer.yml"]
-image:https://github.com/code-ready/crc/actions/workflows/make-rpm.yml/badge.svg["rpm", link="https://github.com/code-ready/crc/actions/workflows/make-rpm.yml"]
-image:https://github.com/code-ready/crc/actions/workflows/make-check-win.yml/badge.svg["win", link="https://github.com/code-ready/crc/actions/workflows/make-check-win.yml"]
+image:https://github.com/crc-org/crc/actions/workflows/make-check.yml/badge.svg?branch=main["main", link="https://github.com/crc-org/crc/actions/workflows/make-check.yml"]
+image:https://github.com/crc-org/crc/actions/workflows/windows-installer.yml/badge.svg["win msi", link="https://github.com/crc-org/crc/actions/workflows/windows-installer.yml"]
+image:https://github.com/crc-org/crc/actions/workflows/macos-installer.yml/badge.svg["macos pkg", link="https://github.com/crc-org/crc/actions/workflows/macos-installer.yml"]
+image:https://github.com/crc-org/crc/actions/workflows/make-rpm.yml/badge.svg["rpm", link="https://github.com/crc-org/crc/actions/workflows/make-rpm.yml"]
+image:https://github.com/crc-org/crc/actions/workflows/make-check-win.yml/badge.svg["win", link="https://github.com/crc-org/crc/actions/workflows/make-check-win.yml"]
 
 [[intro-to-crc]]
 == Introduction
@@ -42,7 +42,7 @@ CRC binaries with an embedded OpenShift disk image can be downloaded from link:h
 
 The documentation for CRC is currently hosted by GitHub Pages.
 
-See the link:https://code-ready.github.io/crc/[CRC Getting Started Guide].
+See the link:https://crc-org.github.io/crc/[CRC Getting Started Guide].
 
 === Building the documentation
 
@@ -51,7 +51,7 @@ You can find the source files for the documentation in the link:./docs/source[do
 To build the formatted documentation, link:https://github.com/containers/libpod/blob/master/install.md[install podman] then use the following:
 
 ```bash
-$ git clone https://github.com/code-ready/crc
+$ git clone https://github.com/crc-org/crc
 $ cd crc
 $ make build_docs
 ```
diff --git a/cmd/crc-embedder/cmd/embed.go b/cmd/crc-embedder/cmd/embed.go
index f294d4b14..42076bef7 100644
--- a/cmd/crc-embedder/cmd/embed.go
+++ b/cmd/crc-embedder/cmd/embed.go
@@ -8,12 +8,12 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/download"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/download"
 
-	"github.com/code-ready/crc/pkg/crc/machine/libvirt"
-	"github.com/code-ready/crc/pkg/crc/machine/vfkit"
+	"github.com/crc-org/crc/pkg/crc/machine/libvirt"
+	"github.com/crc-org/crc/pkg/crc/machine/vfkit"
 
 	"github.com/YourFin/binappend"
 	"github.com/spf13/cobra"
diff --git a/cmd/crc-embedder/cmd/extract.go b/cmd/crc-embedder/cmd/extract.go
index 19abe435b..45bbb5bf3 100644
--- a/cmd/crc-embedder/cmd/extract.go
+++ b/cmd/crc-embedder/cmd/extract.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/embed"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/embed"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc-embedder/cmd/list.go b/cmd/crc-embedder/cmd/list.go
index 782835374..d4bd10d75 100644
--- a/cmd/crc-embedder/cmd/list.go
+++ b/cmd/crc-embedder/cmd/list.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/YourFin/binappend"
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc-embedder/cmd/root.go b/cmd/crc-embedder/cmd/root.go
index 199b5b716..d2f78405d 100644
--- a/cmd/crc-embedder/cmd/root.go
+++ b/cmd/crc-embedder/cmd/root.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc-embedder/crc-embedder.go b/cmd/crc-embedder/crc-embedder.go
index 50fe107c7..61ac1a746 100644
--- a/cmd/crc-embedder/crc-embedder.go
+++ b/cmd/crc-embedder/crc-embedder.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/code-ready/crc/cmd/crc-embedder/cmd"
+	"github.com/crc-org/crc/cmd/crc-embedder/cmd"
 )
 
 func main() {
diff --git a/cmd/crc/cmd/bundle/bundle.go b/cmd/crc/cmd/bundle/bundle.go
index 90143f600..383a1eb7a 100644
--- a/cmd/crc/cmd/bundle/bundle.go
+++ b/cmd/crc/cmd/bundle/bundle.go
@@ -1,7 +1,7 @@
 package bundle
 
 import (
-	"github.com/code-ready/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/config"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/bundle/generate.go b/cmd/crc/cmd/bundle/generate.go
index 4101525b7..2ca3a76f6 100644
--- a/cmd/crc/cmd/bundle/generate.go
+++ b/cmd/crc/cmd/bundle/generate.go
@@ -1,10 +1,10 @@
 package bundle
 
 import (
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/cleanup.go b/cmd/crc/cmd/cleanup.go
index 0262bdb99..e1fcf327f 100644
--- a/cmd/crc/cmd/cleanup.go
+++ b/cmd/crc/cmd/cleanup.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"os"
 
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/preflight"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/preflight"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/config/config.go b/cmd/crc/cmd/config/config.go
index 12ca4bb99..86ee75d17 100644
--- a/cmd/crc/cmd/config/config.go
+++ b/cmd/crc/cmd/config/config.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/code-ready/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/config"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/config/get.go b/cmd/crc/cmd/config/get.go
index c2f35b807..9a9ef7d4c 100644
--- a/cmd/crc/cmd/config/get.go
+++ b/cmd/crc/cmd/config/get.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/telemetry"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/config/set.go b/cmd/crc/cmd/config/set.go
index c7930ba67..84f47ea7b 100644
--- a/cmd/crc/cmd/config/set.go
+++ b/cmd/crc/cmd/config/set.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/telemetry"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/config/unset.go b/cmd/crc/cmd/config/unset.go
index 4bb949c01..8b6e8000b 100644
--- a/cmd/crc/cmd/config/unset.go
+++ b/cmd/crc/cmd/config/unset.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/telemetry"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/config/view.go b/cmd/crc/cmd/config/view.go
index 1a8109a5c..af86f0564 100644
--- a/cmd/crc/cmd/config/view.go
+++ b/cmd/crc/cmd/config/view.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"text/template"
 
-	"github.com/code-ready/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/config"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/console.go b/cmd/crc/cmd/console.go
index a303aa19d..0988d15ab 100644
--- a/cmd/crc/cmd/console.go
+++ b/cmd/crc/cmd/console.go
@@ -6,10 +6,10 @@ import (
 	"io"
 	"os"
 
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/machine"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/crc/cmd/daemon.go b/cmd/crc/cmd/daemon.go
index a16201a3f..2a1b94488 100644
--- a/cmd/crc/cmd/daemon.go
+++ b/cmd/crc/cmd/daemon.go
@@ -12,14 +12,14 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/adminhelper"
-	"github.com/code-ready/crc/pkg/crc/api"
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/daemonclient"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
 	"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
+	"github.com/crc-org/crc/pkg/crc/adminhelper"
+	"github.com/crc-org/crc/pkg/crc/api"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/daemonclient"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/docker/go-units"
 	"github.com/gorilla/handlers"
 	"github.com/pkg/errors"
diff --git a/cmd/crc/cmd/daemon_darwin.go b/cmd/crc/cmd/daemon_darwin.go
index a2c969b5a..11ec200ca 100644
--- a/cmd/crc/cmd/daemon_darwin.go
+++ b/cmd/crc/cmd/daemon_darwin.go
@@ -4,8 +4,8 @@ import (
 	"net"
 	"os"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 func vsockListener() (net.Listener, error) {
diff --git a/cmd/crc/cmd/daemon_linux.go b/cmd/crc/cmd/daemon_linux.go
index b0af0e58f..36e6854b1 100644
--- a/cmd/crc/cmd/daemon_linux.go
+++ b/cmd/crc/cmd/daemon_linux.go
@@ -5,9 +5,9 @@ import (
 	"net"
 	"os"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
 
 	"github.com/coreos/go-systemd/v22/activation"
 	"github.com/coreos/go-systemd/v22/daemon"
diff --git a/cmd/crc/cmd/daemon_windows.go b/cmd/crc/cmd/daemon_windows.go
index e94d1083d..7f6259781 100644
--- a/cmd/crc/cmd/daemon_windows.go
+++ b/cmd/crc/cmd/daemon_windows.go
@@ -4,9 +4,9 @@ import (
 	"net"
 
 	"github.com/Microsoft/go-winio"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/containers/gvisor-tap-vsock/pkg/transport"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 func vsockListener() (net.Listener, error) {
diff --git a/cmd/crc/cmd/delete.go b/cmd/crc/cmd/delete.go
index 71fa8e7af..126017cda 100644
--- a/cmd/crc/cmd/delete.go
+++ b/cmd/crc/cmd/delete.go
@@ -6,11 +6,11 @@ import (
 	"io"
 	"os"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/input"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/input"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/oc_env.go b/cmd/crc/cmd/oc_env.go
index 04b5e0614..fcbc49481 100644
--- a/cmd/crc/cmd/oc_env.go
+++ b/cmd/crc/cmd/oc_env.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/os/shell"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/os/shell"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/podman_env.go b/cmd/crc/cmd/podman_env.go
index 1a9a1c04d..cc0c82182 100644
--- a/cmd/crc/cmd/podman_env.go
+++ b/cmd/crc/cmd/podman_env.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/os/shell"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/os/shell"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/root.go b/cmd/crc/cmd/root.go
index 23026033a..8c2f29063 100644
--- a/cmd/crc/cmd/root.go
+++ b/cmd/crc/cmd/root.go
@@ -8,17 +8,17 @@ import (
 	"strings"
 	"time"
 
-	cmdBundle "github.com/code-ready/crc/cmd/crc/cmd/bundle"
-	cmdConfig "github.com/code-ready/crc/cmd/crc/cmd/config"
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcErr "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preflight"
-	"github.com/code-ready/crc/pkg/crc/segment"
-	"github.com/code-ready/crc/pkg/crc/telemetry"
+	cmdBundle "github.com/crc-org/crc/cmd/crc/cmd/bundle"
+	cmdConfig "github.com/crc-org/crc/cmd/crc/cmd/config"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcErr "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preflight"
+	"github.com/crc-org/crc/pkg/crc/segment"
+	"github.com/crc-org/crc/pkg/crc/telemetry"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/util/exec"
 )
diff --git a/cmd/crc/cmd/setup.go b/cmd/crc/cmd/setup.go
index 24ca86657..88c0aaed3 100644
--- a/cmd/crc/cmd/setup.go
+++ b/cmd/crc/cmd/setup.go
@@ -5,12 +5,12 @@ import (
 	"io"
 	"os"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/input"
-	"github.com/code-ready/crc/pkg/crc/preflight"
-	"github.com/code-ready/crc/pkg/crc/validation"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/input"
+	"github.com/crc-org/crc/pkg/crc/preflight"
+	"github.com/crc-org/crc/pkg/crc/validation"
 
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/util/exec"
diff --git a/cmd/crc/cmd/start.go b/cmd/crc/cmd/start.go
index 543aae415..7e0d9dc2a 100644
--- a/cmd/crc/cmd/start.go
+++ b/cmd/crc/cmd/start.go
@@ -11,20 +11,20 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/daemonclient"
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preflight"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/validation"
-	crcversion "github.com/code-ready/crc/pkg/crc/version"
-	crcos "github.com/code-ready/crc/pkg/os"
-	"github.com/code-ready/crc/pkg/os/shell"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/daemonclient"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preflight"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/validation"
+	crcversion "github.com/crc-org/crc/pkg/crc/version"
+	crcos "github.com/crc-org/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/os/shell"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
diff --git a/cmd/crc/cmd/status.go b/cmd/crc/cmd/status.go
index 3471aa109..b8b2f4f0a 100644
--- a/cmd/crc/cmd/status.go
+++ b/cmd/crc/cmd/status.go
@@ -9,11 +9,11 @@ import (
 	"path/filepath"
 	"text/tabwriter"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/daemonclient"
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/daemonclient"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/crc/cmd/stop.go b/cmd/crc/cmd/stop.go
index cfae562ca..1195f8bf2 100644
--- a/cmd/crc/cmd/stop.go
+++ b/cmd/crc/cmd/stop.go
@@ -5,10 +5,10 @@ import (
 	"io"
 	"os"
 
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/input"
-	"github.com/code-ready/crc/pkg/crc/machine"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/input"
+	"github.com/crc-org/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/cmd/version.go b/cmd/crc/cmd/version.go
index 7d71d9c78..86ba6e73b 100644
--- a/cmd/crc/cmd/version.go
+++ b/cmd/crc/cmd/version.go
@@ -5,10 +5,10 @@ import (
 	"io"
 	"os"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
-	crcversion "github.com/code-ready/crc/pkg/crc/version"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
+	crcversion "github.com/crc-org/crc/pkg/crc/version"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/crc/main.go b/cmd/crc/main.go
index f231bde0a..63d217ac0 100644
--- a/cmd/crc/main.go
+++ b/cmd/crc/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/code-ready/crc/cmd/crc/cmd"
+	"github.com/crc-org/crc/cmd/crc/cmd"
 )
 
 func main() {
diff --git a/developing.adoc b/developing.adoc
index a481d8ad7..5410d9339 100644
--- a/developing.adoc
+++ b/developing.adoc
@@ -28,7 +28,7 @@ You should be able to develop the project on Linux, Windows, or macOS.
 Get the sources from GitHub:
 
 ----
-$ git clone https://github.com/code-ready/crc.git
+$ git clone https://github.com/crc-org/crc.git
 ----
 
 [NOTE]
@@ -100,7 +100,7 @@ We have automated e2e tests which keep CodeReady Containers in shape.
 
 [[intro-to-e2e-testing]]
 === Introduction
-End-to-end (e2e) tests borrow code from link:http://github.com/code-ready/clicumber[Clicumber] package to provide basic functionality for testing CLI binaries. This facilitates running commands in a persistent shell instance (`bash`, `tcsh`, `zsh`, Command Prompt, or PowerShell), assert its outputs (standard output, standard error, or exit code), check configuration files, and so on. The general functionality of Clicumber is then extended by CodeReady Containers specific test code to cover the whole functionality of CodeReady Containers.
+End-to-end (e2e) tests borrow code from link:http://github.com/crc-org/clicumber[Clicumber] package to provide basic functionality for testing CLI binaries. This facilitates running commands in a persistent shell instance (`bash`, `tcsh`, `zsh`, Command Prompt, or PowerShell), assert its outputs (standard output, standard error, or exit code), check configuration files, and so on. The general functionality of Clicumber is then extended by CodeReady Containers specific test code to cover the whole functionality of CodeReady Containers.
 
 [[how-to-run-e2e-tests]]
 === How to run
diff --git a/docs/source/meta/product-attributes.adoc b/docs/source/meta/product-attributes.adoc
index 9297a9315..109101af5 100644
--- a/docs/source/meta/product-attributes.adoc
+++ b/docs/source/meta/product-attributes.adoc
@@ -31,7 +31,7 @@
 
 // URLs
 :crc-download-url: https://console.redhat.com/openshift/create/local
-:crc-gsg-url: https://code-ready.github.io/crc/
+:crc-gsg-url: https://crc-org.github.io/crc/
 
 :openshift-installer-url: https://console.redhat.com/openshift/install
 :openshift-docs-url: https://docs.openshift.com/container-platform/latest
diff --git a/docs/source/topics/proc_troubleshooting-unknown-issues.adoc b/docs/source/topics/proc_troubleshooting-unknown-issues.adoc
index 4e693f2a3..9bac4b33f 100644
--- a/docs/source/topics/proc_troubleshooting-unknown-issues.adoc
+++ b/docs/source/topics/proc_troubleshooting-unknown-issues.adoc
@@ -63,6 +63,6 @@ The cluster takes a minimum of four minutes to start the necessary containers an
 
 If your issue is not resolved by this procedure, perform the following steps:
 
-. link:https://github.com/code-ready/crc/issues[Search open issues] for the issue that you are encountering.
-. If no existing issue addresses the encountered issue, link:https://github.com/code-ready/crc/issues/new[create an issue] and link:https://help.github.com/en/articles/file-attachments-on-issues-and-pull-requests[attach the [filename]*_~/.crc/crc.log_* file] to the created issue.
+. link:https://github.com/crc-org/crc/issues[Search open issues] for the issue that you are encountering.
+. If no existing issue addresses the encountered issue, link:https://github.com/crc-org/crc/issues/new[create an issue] and link:https://help.github.com/en/articles/file-attachments-on-issues-and-pull-requests[attach the [filename]*_~/.crc/crc.log_* file] to the created issue.
 The [filename]*_~/.crc/crc.log_* file has detailed debugging and troubleshooting information which can help diagnose the problem that you are experiencing.
diff --git a/go.mod b/go.mod
index c42817b09..64f1c4e8e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/code-ready/crc
+module github.com/crc-org/crc
 
 go 1.17
 
diff --git a/images/openshift-ci/Dockerfile b/images/openshift-ci/Dockerfile
index c7cf9b388..d34ac253f 100644
--- a/images/openshift-ci/Dockerfile
+++ b/images/openshift-ci/Dockerfile
@@ -2,17 +2,17 @@
 # It builds an image containing crc and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments.
 
 FROM registry.ci.openshift.org/openshift/release:golang-1.17 AS builder
-WORKDIR /go/src/github.com/code-ready/crc
+WORKDIR /go/src/github.com/crc-org/crc
 COPY . .
 RUN make release
 
 FROM quay.io/centos/centos:stream8
-COPY --from=builder /go/src/github.com/code-ready/crc /opt/crc
-COPY --from=builder /go/src/github.com/code-ready/crc/out/linux-amd64/crc /bin/crc
-COPY --from=builder /go/src/github.com/code-ready/crc/out/windows-amd64/crc.exe /opt/crc.exe
-COPY --from=builder /go/src/github.com/code-ready/crc/images/openshift-ci/mock-nss.sh /bin/mock-nss.sh
-COPY --from=builder /go/src/github.com/code-ready/crc/images/openshift-ci/google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
-COPY --from=builder /go/src/github.com/code-ready/crc/images/openshift-ci/azure-cli.repo /etc/yum.repos.d/azure-cli.repo
+COPY --from=builder /go/src/github.com/crc-org/crc /opt/crc
+COPY --from=builder /go/src/github.com/crc-org/crc/out/linux-amd64/crc /bin/crc
+COPY --from=builder /go/src/github.com/crc-org/crc/out/windows-amd64/crc.exe /opt/crc.exe
+COPY --from=builder /go/src/github.com/crc-org/crc/images/openshift-ci/mock-nss.sh /bin/mock-nss.sh
+COPY --from=builder /go/src/github.com/crc-org/crc/images/openshift-ci/google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
+COPY --from=builder /go/src/github.com/crc-org/crc/images/openshift-ci/azure-cli.repo /etc/yum.repos.d/azure-cli.repo
 
 RUN yum update -y && \
     yum install --setopt=tsflags=nodocs -y \
diff --git a/packaging/rpm/crc.spec.in b/packaging/rpm/crc.spec.in
index 85703dda0..5658a6257 100644
--- a/packaging/rpm/crc.spec.in
+++ b/packaging/rpm/crc.spec.in
@@ -1,5 +1,5 @@
 # https://github.com/crc-org/admin-helper
-%global goipath         github.com/code-ready/crc
+%global goipath         github.com/crc-org/crc
 %global goname          crc
 Version:                __VERSION__
 %global 	 	openshift_suffix -__OPENSHIFT_VERSION__
diff --git a/pkg/compress/compress.go b/pkg/compress/compress.go
index bed9498cd..b6356a493 100644
--- a/pkg/compress/compress.go
+++ b/pkg/compress/compress.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/klauspost/compress/zstd"
 )
 
diff --git a/pkg/crc/adminhelper/hosts.go b/pkg/crc/adminhelper/hosts.go
index 76d54177d..3503a3ebf 100644
--- a/pkg/crc/adminhelper/hosts.go
+++ b/pkg/crc/adminhelper/hosts.go
@@ -3,9 +3,9 @@ package adminhelper
 import (
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/crc-org/admin-helper/pkg/hosts"
 	"github.com/crc-org/admin-helper/pkg/types"
+	"github.com/crc-org/crc/pkg/crc/constants"
 )
 
 var (
diff --git a/pkg/crc/adminhelper/hosts_unix.go b/pkg/crc/adminhelper/hosts_unix.go
index 06de32374..ae3cc571c 100644
--- a/pkg/crc/adminhelper/hosts_unix.go
+++ b/pkg/crc/adminhelper/hosts_unix.go
@@ -4,8 +4,8 @@
 package adminhelper
 
 import (
-	crcos "github.com/code-ready/crc/pkg/os"
 	"github.com/crc-org/admin-helper/pkg/types"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 func execute(args ...string) error {
diff --git a/pkg/crc/api/api_http.go b/pkg/crc/api/api_http.go
index 21647bf3d..2331efca8 100644
--- a/pkg/crc/api/api_http.go
+++ b/pkg/crc/api/api_http.go
@@ -3,9 +3,9 @@ package api
 import (
 	"net/http"
 
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/machine"
 )
 
 func NewMux(config *crcConfig.Config, machine machine.Client, logger Logger, telemetry Telemetry) http.Handler {
diff --git a/pkg/crc/api/client/types.go b/pkg/crc/api/client/types.go
index c9550c2cc..d50289306 100644
--- a/pkg/crc/api/client/types.go
+++ b/pkg/crc/api/client/types.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/preset"
 )
 
 type VersionResult struct {
diff --git a/pkg/crc/api/handlers.go b/pkg/crc/api/handlers.go
index 24779da9e..0f846f417 100644
--- a/pkg/crc/api/handlers.go
+++ b/pkg/crc/api/handlers.go
@@ -4,15 +4,15 @@ import (
 	gocontext "context"
 	"net/http"
 
-	"github.com/code-ready/crc/pkg/crc/api/client"
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/machine"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/preflight"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/version"
+	"github.com/crc-org/crc/pkg/crc/api/client"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/preflight"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/version"
 )
 
 type Handler struct {
diff --git a/pkg/crc/api/helpers.go b/pkg/crc/api/helpers.go
index 520f9f5fe..5f745e457 100644
--- a/pkg/crc/api/helpers.go
+++ b/pkg/crc/api/helpers.go
@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"sync"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 type context struct {
diff --git a/pkg/crc/cache/cache.go b/pkg/crc/cache/cache.go
index 45c92a230..ee66df9c6 100644
--- a/pkg/crc/cache/cache.go
+++ b/pkg/crc/cache/cache.go
@@ -7,13 +7,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/version"
-	"github.com/code-ready/crc/pkg/download"
-	"github.com/code-ready/crc/pkg/embed"
-	"github.com/code-ready/crc/pkg/extract"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/version"
+	"github.com/crc-org/crc/pkg/download"
+	"github.com/crc-org/crc/pkg/embed"
+	"github.com/crc-org/crc/pkg/extract"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/cache/cache_darwin.go b/pkg/crc/cache/cache_darwin.go
index f9f2b95aa..d37396964 100644
--- a/pkg/crc/cache/cache_darwin.go
+++ b/pkg/crc/cache/cache_darwin.go
@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"github.com/code-ready/crc/pkg/crc/machine/vfkit"
+	"github.com/crc-org/crc/pkg/crc/machine/vfkit"
 )
 
 func NewVfkitCache() *Cache {
diff --git a/pkg/crc/cache/cache_linux.go b/pkg/crc/cache/cache_linux.go
index 7a75ec8fe..b54b811a1 100644
--- a/pkg/crc/cache/cache_linux.go
+++ b/pkg/crc/cache/cache_linux.go
@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"github.com/code-ready/crc/pkg/crc/machine/libvirt"
+	"github.com/crc-org/crc/pkg/crc/machine/libvirt"
 )
 
 func NewMachineDriverLibvirtCache() *Cache {
diff --git a/pkg/crc/cluster/cert_renewal.go b/pkg/crc/cluster/cert_renewal.go
index f1f939581..2a082b27a 100644
--- a/pkg/crc/cluster/cert_renewal.go
+++ b/pkg/crc/cluster/cert_renewal.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/oc"
-	"github.com/code-ready/crc/pkg/crc/ssh"
+	crcerrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/oc"
+	"github.com/crc-org/crc/pkg/crc/ssh"
 
 	k8scerts "k8s.io/api/certificates/v1beta1"
 )
diff --git a/pkg/crc/cluster/cluster.go b/pkg/crc/cluster/cluster.go
index affaffb2e..e6d39498c 100644
--- a/pkg/crc/cluster/cluster.go
+++ b/pkg/crc/cluster/cluster.go
@@ -12,14 +12,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/oc"
-	"github.com/code-ready/crc/pkg/crc/ssh"
-	crctls "github.com/code-ready/crc/pkg/crc/tls"
-	"github.com/code-ready/crc/pkg/crc/validation"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/oc"
+	"github.com/crc-org/crc/pkg/crc/ssh"
+	crctls "github.com/crc-org/crc/pkg/crc/tls"
+	"github.com/crc-org/crc/pkg/crc/validation"
 	"github.com/pborman/uuid"
 )
 
diff --git a/pkg/crc/cluster/clusteroperator.go b/pkg/crc/cluster/clusteroperator.go
index 34fca6f1d..bd19ca0a6 100644
--- a/pkg/crc/cluster/clusteroperator.go
+++ b/pkg/crc/cluster/clusteroperator.go
@@ -15,7 +15,7 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	openshiftapi "github.com/openshift/api/config/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/crc/cluster/csr.go b/pkg/crc/cluster/csr.go
index 9ed5e78a6..b835b032d 100644
--- a/pkg/crc/cluster/csr.go
+++ b/pkg/crc/cluster/csr.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/oc"
+	crcerrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/oc"
 	"github.com/pkg/errors"
 	k8scerts "k8s.io/api/certificates/v1beta1"
 )
diff --git a/pkg/crc/cluster/kubeadmin_password.go b/pkg/crc/cluster/kubeadmin_password.go
index 87b0f9a60..3054b2406 100644
--- a/pkg/crc/cluster/kubeadmin_password.go
+++ b/pkg/crc/cluster/kubeadmin_password.go
@@ -11,9 +11,9 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/oc"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/oc"
 	"golang.org/x/crypto/bcrypt"
 )
 
diff --git a/pkg/crc/cluster/monitoring.go b/pkg/crc/cluster/monitoring.go
index 37172ba18..53dc2ff7e 100644
--- a/pkg/crc/cluster/monitoring.go
+++ b/pkg/crc/cluster/monitoring.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/oc"
+	"github.com/crc-org/crc/pkg/crc/oc"
 	v1 "github.com/openshift/api/config/v1"
 	log "github.com/sirupsen/logrus"
 )
diff --git a/pkg/crc/cluster/pullsecret.go b/pkg/crc/cluster/pullsecret.go
index 53ca708be..2494886cb 100644
--- a/pkg/crc/cluster/pullsecret.go
+++ b/pkg/crc/cluster/pullsecret.go
@@ -10,12 +10,12 @@ import (
 	"io/ioutil"
 	"strings"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/validation"
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/validation"
+	crcos "github.com/crc-org/crc/pkg/os"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/zalando/go-keyring"
diff --git a/pkg/crc/cluster/status.go b/pkg/crc/cluster/status.go
index bf614d3cf..87b2bd76e 100644
--- a/pkg/crc/cluster/status.go
+++ b/pkg/crc/cluster/status.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/network"
 )
 
 // WaitForClusterStable checks that the cluster is running a number of consecutive times
diff --git a/pkg/crc/config/config.go b/pkg/crc/config/config.go
index 58c5b0ce1..87b49ff0f 100644
--- a/pkg/crc/config/config.go
+++ b/pkg/crc/config/config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/spf13/cast"
 )
 
diff --git a/pkg/crc/config/secret_config.go b/pkg/crc/config/secret_config.go
index 444365b80..5bb3fa50a 100644
--- a/pkg/crc/config/secret_config.go
+++ b/pkg/crc/config/secret_config.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/spf13/cast"
 	"github.com/zalando/go-keyring"
 )
diff --git a/pkg/crc/config/settings.go b/pkg/crc/config/settings.go
index cb034a8ba..11bf25581 100644
--- a/pkg/crc/config/settings.go
+++ b/pkg/crc/config/settings.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/version"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/version"
 )
 
 const (
diff --git a/pkg/crc/config/validations.go b/pkg/crc/config/validations.go
index 09d1d8028..c60844b4a 100644
--- a/pkg/crc/config/validations.go
+++ b/pkg/crc/config/validations.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/network"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/validation"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/network"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/validation"
 	"github.com/spf13/cast"
 )
 
diff --git a/pkg/crc/constants/constants.go b/pkg/crc/constants/constants.go
index 8d5cb9de4..be67ad44f 100644
--- a/pkg/crc/constants/constants.go
+++ b/pkg/crc/constants/constants.go
@@ -7,8 +7,8 @@ import (
 	"runtime"
 	"strings"
 
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/version"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/version"
 )
 
 const (
@@ -25,8 +25,8 @@ const (
 	DaemonLogFile             = "crcd.log"
 	CrcLandingPageURL         = "https://console.redhat.com/openshift/create/local" // #nosec G101
 	DefaultAdminHelperURLBase = "https://github.com/crc-org/admin-helper/releases/download/v%s/%s"
-	CRCMacTrayDownloadURL     = "https://github.com/code-ready/tray-electron/releases/download/%s/crc-tray-macos.tar.gz"
-	CRCWindowsTrayDownloadURL = "https://github.com/code-ready/tray-electron/releases/download/%s/crc-tray-windows.zip"
+	CRCMacTrayDownloadURL     = "https://github.com/crc-org/tray-electron/releases/download/%s/crc-tray-macos.tar.gz"
+	CRCWindowsTrayDownloadURL = "https://github.com/crc-org/tray-electron/releases/download/%s/crc-tray-windows.zip"
 	DefaultContext            = "admin"
 	DaemonHTTPEndpoint        = "http://unix/api"
 	DefaultPodmanNamedPipe    = `\\.\pipe\crc-podman`
diff --git a/pkg/crc/constants/constants_darwin.go b/pkg/crc/constants/constants_darwin.go
index 97167b47e..c23eaceb4 100644
--- a/pkg/crc/constants/constants_darwin.go
+++ b/pkg/crc/constants/constants_darwin.go
@@ -3,7 +3,7 @@ package constants
 import (
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/version"
+	"github.com/crc-org/crc/pkg/crc/version"
 )
 
 const (
diff --git a/pkg/crc/daemonclient/client.go b/pkg/crc/daemonclient/client.go
index 493ce451e..989bf2a1b 100644
--- a/pkg/crc/daemonclient/client.go
+++ b/pkg/crc/daemonclient/client.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/code-ready/crc/pkg/crc/api/client"
-	crcversion "github.com/code-ready/crc/pkg/crc/version"
 	networkclient "github.com/containers/gvisor-tap-vsock/pkg/client"
+	"github.com/crc-org/crc/pkg/crc/api/client"
+	crcversion "github.com/crc-org/crc/pkg/crc/version"
 	pkgerrors "github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/daemonclient/transport_unix.go b/pkg/crc/daemonclient/transport_unix.go
index bdf70487c..d7d542df9 100644
--- a/pkg/crc/daemonclient/transport_unix.go
+++ b/pkg/crc/daemonclient/transport_unix.go
@@ -8,7 +8,7 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/constants"
 )
 
 func transport() *http.Transport {
diff --git a/pkg/crc/daemonclient/transport_windows.go b/pkg/crc/daemonclient/transport_windows.go
index 1974c15c2..c103d4ea8 100644
--- a/pkg/crc/daemonclient/transport_windows.go
+++ b/pkg/crc/daemonclient/transport_windows.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/Microsoft/go-winio"
-	"github.com/code-ready/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/constants"
 )
 
 func transport() *http.Transport {
diff --git a/pkg/crc/errors/multierror.go b/pkg/crc/errors/multierror.go
index 4ff151b39..c834d6a95 100644
--- a/pkg/crc/errors/multierror.go
+++ b/pkg/crc/errors/multierror.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 type vmNotExist string
diff --git a/pkg/crc/gpg/gpg.go b/pkg/crc/gpg/gpg.go
index 1421f13c1..a088ac997 100644
--- a/pkg/crc/gpg/gpg.go
+++ b/pkg/crc/gpg/gpg.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/code-ready/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/constants"
 )
 
 func Verify(filePath, signatureFilePath string) error {
diff --git a/pkg/crc/image/image.go b/pkg/crc/image/image.go
index e9aa7aac4..74ea79119 100644
--- a/pkg/crc/image/image.go
+++ b/pkg/crc/image/image.go
@@ -11,16 +11,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/gpg"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/version"
-	"github.com/code-ready/crc/pkg/extract"
 	"github.com/containers/image/v5/copy"
 	"github.com/containers/image/v5/directory"
 	"github.com/containers/image/v5/docker"
 	"github.com/containers/image/v5/signature"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/gpg"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/version"
+	"github.com/crc-org/crc/pkg/extract"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
diff --git a/pkg/crc/input/input.go b/pkg/crc/input/input.go
index cd1811d4e..a2a7aea05 100644
--- a/pkg/crc/input/input.go
+++ b/pkg/crc/input/input.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 func PromptUserForYesOrNo(message string, force bool) bool {
diff --git a/pkg/crc/machine/bundle/constants.go b/pkg/crc/machine/bundle/constants.go
index 01a34b004..f58e484f1 100644
--- a/pkg/crc/machine/bundle/constants.go
+++ b/pkg/crc/machine/bundle/constants.go
@@ -1,8 +1,8 @@
 package bundle
 
 import (
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/download"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/download"
 )
 
 var bundleLocations = map[string]bundlesDownloadInfo{
diff --git a/pkg/crc/machine/bundle/copier.go b/pkg/crc/machine/bundle/copier.go
index d52c4fa85..67a158df9 100644
--- a/pkg/crc/machine/bundle/copier.go
+++ b/pkg/crc/machine/bundle/copier.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/compress"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/compress"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcos "github.com/crc-org/crc/pkg/os"
 	godeepcopy "github.com/jinzhu/copier"
 )
 
diff --git a/pkg/crc/machine/bundle/metadata.go b/pkg/crc/machine/bundle/metadata.go
index f691a8aeb..bf856762c 100644
--- a/pkg/crc/machine/bundle/metadata.go
+++ b/pkg/crc/machine/bundle/metadata.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/image"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/download"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/image"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/download"
 )
 
 // Metadata structure to unmarshal the crc-bundle-info.json file
diff --git a/pkg/crc/machine/bundle/repository.go b/pkg/crc/machine/bundle/repository.go
index 5ebfa4eea..aa8f89080 100644
--- a/pkg/crc/machine/bundle/repository.go
+++ b/pkg/crc/machine/bundle/repository.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/extract"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcerrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/extract"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/machine/client.go b/pkg/crc/machine/client.go
index e746fd8a6..812f76a5c 100644
--- a/pkg/crc/machine/client.go
+++ b/pkg/crc/machine/client.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"time"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/network"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/network"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/kofalt/go-memoize"
 )
 
diff --git a/pkg/crc/machine/config/config.go b/pkg/crc/machine/config/config.go
index c8a99d6aa..b2e63f4bb 100644
--- a/pkg/crc/machine/config/config.go
+++ b/pkg/crc/machine/config/config.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/code-ready/crc/pkg/crc/network"
+import "github.com/crc-org/crc/pkg/crc/network"
 
 type MachineConfig struct {
 	// CRC system bundle
diff --git a/pkg/crc/machine/console.go b/pkg/crc/machine/console.go
index 5a3405f09..4e933bc45 100644
--- a/pkg/crc/machine/console.go
+++ b/pkg/crc/machine/console.go
@@ -3,7 +3,7 @@ package machine
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/machine/delete.go b/pkg/crc/machine/delete.go
index cb3d010d8..3d841d71d 100644
--- a/pkg/crc/machine/delete.go
+++ b/pkg/crc/machine/delete.go
@@ -3,8 +3,8 @@ package machine
 import (
 	"os"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/podman"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/podman"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/machine/driver.go b/pkg/crc/machine/driver.go
index 925ed97d3..857dc8be8 100644
--- a/pkg/crc/machine/driver.go
+++ b/pkg/crc/machine/driver.go
@@ -1,8 +1,8 @@
 package machine
 
 import (
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 	libmachine "github.com/crc-org/machine/libmachine/drivers"
 )
 
diff --git a/pkg/crc/machine/driver_darwin.go b/pkg/crc/machine/driver_darwin.go
index ca6999618..ffc87ab9c 100644
--- a/pkg/crc/machine/driver_darwin.go
+++ b/pkg/crc/machine/driver_darwin.go
@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/crc/machine/vfkit"
-	machineVf "github.com/code-ready/crc/pkg/drivers/vfkit"
-	"github.com/code-ready/crc/pkg/libmachine"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/crc/machine/vfkit"
+	machineVf "github.com/crc-org/crc/pkg/drivers/vfkit"
+	"github.com/crc-org/crc/pkg/libmachine"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 	"github.com/crc-org/machine/libmachine/drivers"
 )
 
diff --git a/pkg/crc/machine/driver_linux.go b/pkg/crc/machine/driver_linux.go
index 9d48cbaee..413ea788c 100644
--- a/pkg/crc/machine/driver_linux.go
+++ b/pkg/crc/machine/driver_linux.go
@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/crc/machine/libvirt"
-	"github.com/code-ready/crc/pkg/libmachine"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/crc/machine/libvirt"
+	"github.com/crc-org/crc/pkg/libmachine"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 	machineLibvirt "github.com/crc-org/machine/drivers/libvirt"
 	"github.com/crc-org/machine/libmachine/drivers"
 )
diff --git a/pkg/crc/machine/driver_windows.go b/pkg/crc/machine/driver_windows.go
index dec7fae0e..81c473e43 100644
--- a/pkg/crc/machine/driver_windows.go
+++ b/pkg/crc/machine/driver_windows.go
@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/crc/machine/hyperv"
-	machineHyperv "github.com/code-ready/crc/pkg/drivers/hyperv"
-	"github.com/code-ready/crc/pkg/libmachine"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/crc/machine/hyperv"
+	machineHyperv "github.com/crc-org/crc/pkg/drivers/hyperv"
+	"github.com/crc-org/crc/pkg/libmachine"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 )
 
 func newHost(api libmachine.API, machineConfig config.MachineConfig) (*host.Host, error) {
diff --git a/pkg/crc/machine/fakemachine/client.go b/pkg/crc/machine/fakemachine/client.go
index 078482a48..2eb52658d 100644
--- a/pkg/crc/machine/fakemachine/client.go
+++ b/pkg/crc/machine/fakemachine/client.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"errors"
 
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
 )
 
 func NewClient() *Client {
diff --git a/pkg/crc/machine/generate_bundle.go b/pkg/crc/machine/generate_bundle.go
index 81d51b1d1..80021275d 100644
--- a/pkg/crc/machine/generate_bundle.go
+++ b/pkg/crc/machine/generate_bundle.go
@@ -6,12 +6,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/bundle"
-	"github.com/code-ready/crc/pkg/crc/oc"
-	crcssh "github.com/code-ready/crc/pkg/crc/ssh"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/bundle"
+	"github.com/crc-org/crc/pkg/crc/oc"
+	crcssh "github.com/crc-org/crc/pkg/crc/ssh"
 	"github.com/crc-org/machine/libmachine/state"
 	"github.com/pkg/errors"
 )
diff --git a/pkg/crc/machine/generate_bundle_linux.go b/pkg/crc/machine/generate_bundle_linux.go
index 811800d32..b6f1f51e4 100644
--- a/pkg/crc/machine/generate_bundle_linux.go
+++ b/pkg/crc/machine/generate_bundle_linux.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 func copyDiskImage(destDir string) (string, string, error) {
diff --git a/pkg/crc/machine/hyperv/driver_windows.go b/pkg/crc/machine/hyperv/driver_windows.go
index cef3bb2dd..5662aefe7 100644
--- a/pkg/crc/machine/hyperv/driver_windows.go
+++ b/pkg/crc/machine/hyperv/driver_windows.go
@@ -4,11 +4,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/drivers/hyperv"
-	winnet "github.com/code-ready/crc/pkg/os/windows/network"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/drivers/hyperv"
+	winnet "github.com/crc-org/crc/pkg/os/windows/network"
 	"github.com/crc-org/machine/libmachine/drivers"
 )
 
diff --git a/pkg/crc/machine/ip.go b/pkg/crc/machine/ip.go
index 14a529168..4c06ca832 100644
--- a/pkg/crc/machine/ip.go
+++ b/pkg/crc/machine/ip.go
@@ -1,8 +1,8 @@
 package machine
 
 import (
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/machine/kubeconfig.go b/pkg/crc/machine/kubeconfig.go
index 07e582d8b..d9934399e 100644
--- a/pkg/crc/machine/kubeconfig.go
+++ b/pkg/crc/machine/kubeconfig.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
 	"github.com/openshift/oc/pkg/helpers/tokencmd"
 	"k8s.io/apimachinery/third_party/forked/golang/netutil"
 	restclient "k8s.io/client-go/rest"
diff --git a/pkg/crc/machine/libvirt/driver_linux.go b/pkg/crc/machine/libvirt/driver_linux.go
index ba01a26e6..114442859 100644
--- a/pkg/crc/machine/libvirt/driver_linux.go
+++ b/pkg/crc/machine/libvirt/driver_linux.go
@@ -3,9 +3,9 @@ package libvirt
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/crc/network"
 	"github.com/crc-org/machine/drivers/libvirt"
 	"github.com/crc-org/machine/libmachine/drivers"
 )
diff --git a/pkg/crc/machine/machine.go b/pkg/crc/machine/machine.go
index 3490a9a5e..8abe203d7 100644
--- a/pkg/crc/machine/machine.go
+++ b/pkg/crc/machine/machine.go
@@ -4,12 +4,12 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/bundle"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/libmachine"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/bundle"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/libmachine"
 	"github.com/crc-org/machine/libmachine/drivers"
 )
 
diff --git a/pkg/crc/machine/start.go b/pkg/crc/machine/start.go
index 25571d28a..041e77329 100644
--- a/pkg/crc/machine/start.go
+++ b/pkg/crc/machine/start.go
@@ -13,25 +13,25 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/bundle"
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/oc"
-	"github.com/code-ready/crc/pkg/crc/podman"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/services"
-	"github.com/code-ready/crc/pkg/crc/services/dns"
-	crcssh "github.com/code-ready/crc/pkg/crc/ssh"
-	"github.com/code-ready/crc/pkg/crc/systemd"
-	"github.com/code-ready/crc/pkg/crc/telemetry"
-	crctls "github.com/code-ready/crc/pkg/crc/tls"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcerrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/bundle"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/oc"
+	"github.com/crc-org/crc/pkg/crc/podman"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/services"
+	"github.com/crc-org/crc/pkg/crc/services/dns"
+	crcssh "github.com/crc-org/crc/pkg/crc/ssh"
+	"github.com/crc-org/crc/pkg/crc/systemd"
+	"github.com/crc-org/crc/pkg/crc/telemetry"
+	crctls "github.com/crc-org/crc/pkg/crc/tls"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 	"github.com/crc-org/machine/libmachine/drivers"
 	libmachinestate "github.com/crc-org/machine/libmachine/state"
 	"github.com/docker/go-units"
@@ -112,7 +112,7 @@ func (client *client) updateVMConfig(startConfig types.StartConfig, vm *virtualM
 
 func growRootFileSystem(sshRunner *crcssh.Runner) error {
 	// With 4.7, this is quite a manual process until https://github.com/openshift/installer/pull/4746 gets fixed
-	// See https://github.com/code-ready/crc/issues/2104 for details
+	// See https://github.com/crc-org/crc/issues/2104 for details
 	rootPart, _, err := sshRunner.Run("realpath", "/dev/disk/by-label/root")
 	if err != nil {
 		return err
diff --git a/pkg/crc/machine/status.go b/pkg/crc/machine/status.go
index 649a6495f..b09b8e1cd 100644
--- a/pkg/crc/machine/status.go
+++ b/pkg/crc/machine/status.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/machine/stop.go b/pkg/crc/machine/stop.go
index f03fa12f4..0a0d91737 100644
--- a/pkg/crc/machine/stop.go
+++ b/pkg/crc/machine/stop.go
@@ -1,10 +1,10 @@
 package machine
 
 import (
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/systemd"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/systemd"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/machine/sync.go b/pkg/crc/machine/sync.go
index ae7bc76c7..c7643b4b7 100644
--- a/pkg/crc/machine/sync.go
+++ b/pkg/crc/machine/sync.go
@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
 )
 
 const startCancelTimeout = 15 * time.Second
diff --git a/pkg/crc/machine/types/types.go b/pkg/crc/machine/types/types.go
index dba49f732..b0823bc68 100644
--- a/pkg/crc/machine/types/types.go
+++ b/pkg/crc/machine/types/types.go
@@ -1,11 +1,11 @@
 package types
 
 import (
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
 )
 
 type StartConfig struct {
diff --git a/pkg/crc/machine/vfkit/driver_darwin.go b/pkg/crc/machine/vfkit/driver_darwin.go
index ef80be6a0..e0fa1fd6a 100644
--- a/pkg/crc/machine/vfkit/driver_darwin.go
+++ b/pkg/crc/machine/vfkit/driver_darwin.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/config"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/drivers/vfkit"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/config"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/drivers/vfkit"
 	"github.com/crc-org/machine/libmachine/drivers"
 )
 
diff --git a/pkg/crc/machine/virtualmachine.go b/pkg/crc/machine/virtualmachine.go
index ab772efd2..9aee8325f 100644
--- a/pkg/crc/machine/virtualmachine.go
+++ b/pkg/crc/machine/virtualmachine.go
@@ -3,12 +3,12 @@ package machine
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/bundle"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/ssh"
-	"github.com/code-ready/crc/pkg/libmachine"
-	libmachinehost "github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/bundle"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/ssh"
+	"github.com/crc-org/crc/pkg/libmachine"
+	libmachinehost "github.com/crc-org/crc/pkg/libmachine/host"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/machine/vsock.go b/pkg/crc/machine/vsock.go
index d5c11c5c8..084dacc21 100644
--- a/pkg/crc/machine/vsock.go
+++ b/pkg/crc/machine/vsock.go
@@ -7,12 +7,12 @@ import (
 	"runtime"
 	"strconv"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/daemonclient"
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/daemonclient"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/network/nameservers.go b/pkg/crc/network/nameservers.go
index 21b64a947..c90c77a0e 100644
--- a/pkg/crc/network/nameservers.go
+++ b/pkg/crc/network/nameservers.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/ssh"
+	"github.com/crc-org/crc/pkg/crc/ssh"
 )
 
 // HasGivenNameserversConfigured returns true if the instance uses a provided nameserver.
diff --git a/pkg/crc/network/proxy.go b/pkg/crc/network/proxy.go
index eb176e1b6..e65477e74 100644
--- a/pkg/crc/network/proxy.go
+++ b/pkg/crc/network/proxy.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 
 	"github.com/asaskevich/govalidator"
 	"github.com/pkg/errors"
diff --git a/pkg/crc/network/types.go b/pkg/crc/network/types.go
index 355e87019..1885b6361 100644
--- a/pkg/crc/network/types.go
+++ b/pkg/crc/network/types.go
@@ -3,7 +3,7 @@ package network
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/spf13/cast"
 )
 
diff --git a/pkg/crc/network/utils.go b/pkg/crc/network/utils.go
index e7209c7b1..ad3c73794 100644
--- a/pkg/crc/network/utils.go
+++ b/pkg/crc/network/utils.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"runtime"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 func URIStringForDisplay(uri string) (string, error) {
diff --git a/pkg/crc/oc/oc.go b/pkg/crc/oc/oc.go
index b9f74fad6..449346262 100644
--- a/pkg/crc/oc/oc.go
+++ b/pkg/crc/oc/oc.go
@@ -3,9 +3,9 @@ package oc
 import (
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/ssh"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/ssh"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 const (
diff --git a/pkg/crc/podman/podman.go b/pkg/crc/podman/podman.go
index 427aa918a..6e708bbf3 100644
--- a/pkg/crc/podman/podman.go
+++ b/pkg/crc/podman/podman.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 const (
diff --git a/pkg/crc/preflight/labels.go b/pkg/crc/preflight/labels.go
index 9050c9b79..e361e7a84 100644
--- a/pkg/crc/preflight/labels.go
+++ b/pkg/crc/preflight/labels.go
@@ -3,7 +3,7 @@ package preflight
 import (
 	"runtime"
 
-	"github.com/code-ready/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/network"
 )
 
 type LabelName uint32
diff --git a/pkg/crc/preflight/preflight.go b/pkg/crc/preflight/preflight.go
index b8a21ce40..fede4cad4 100644
--- a/pkg/crc/preflight/preflight.go
+++ b/pkg/crc/preflight/preflight.go
@@ -3,9 +3,9 @@ package preflight
 import (
 	"fmt"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 type Flags uint32
diff --git a/pkg/crc/preflight/preflight_checks_common.go b/pkg/crc/preflight/preflight_checks_common.go
index b82030517..9ce8c818f 100644
--- a/pkg/crc/preflight/preflight_checks_common.go
+++ b/pkg/crc/preflight/preflight_checks_common.go
@@ -5,13 +5,13 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/adminhelper"
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/bundle"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/validation"
+	"github.com/crc-org/crc/pkg/crc/adminhelper"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/bundle"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/validation"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/preflight/preflight_checks_darwin.go b/pkg/crc/preflight/preflight_checks_darwin.go
index 5e97c3cdb..b75ea7ad7 100644
--- a/pkg/crc/preflight/preflight_checks_darwin.go
+++ b/pkg/crc/preflight/preflight_checks_darwin.go
@@ -9,12 +9,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/cache"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/version"
-	crcos "github.com/code-ready/crc/pkg/os"
-	"github.com/code-ready/crc/pkg/os/launchd"
+	"github.com/crc-org/crc/pkg/crc/cache"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/version"
+	crcos "github.com/crc-org/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/os/launchd"
 	"github.com/klauspost/cpuid/v2"
 	"golang.org/x/sys/unix"
 )
diff --git a/pkg/crc/preflight/preflight_checks_linux.go b/pkg/crc/preflight/preflight_checks_linux.go
index 484860ab7..5be6d3d15 100644
--- a/pkg/crc/preflight/preflight_checks_linux.go
+++ b/pkg/crc/preflight/preflight_checks_linux.go
@@ -13,14 +13,14 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/code-ready/crc/pkg/crc/cache"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/libvirt"
-	"github.com/code-ready/crc/pkg/crc/systemd"
-	"github.com/code-ready/crc/pkg/crc/systemd/states"
-	crcos "github.com/code-ready/crc/pkg/os"
-	"github.com/code-ready/crc/pkg/os/linux"
+	"github.com/crc-org/crc/pkg/crc/cache"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/libvirt"
+	"github.com/crc-org/crc/pkg/crc/systemd"
+	"github.com/crc-org/crc/pkg/crc/systemd/states"
+	crcos "github.com/crc-org/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/os/linux"
 	"libvirt.org/go/libvirtxml"
 )
 
diff --git a/pkg/crc/preflight/preflight_checks_network_linux.go b/pkg/crc/preflight/preflight_checks_network_linux.go
index 4706f0934..ef8720866 100644
--- a/pkg/crc/preflight/preflight_checks_network_linux.go
+++ b/pkg/crc/preflight/preflight_checks_network_linux.go
@@ -9,10 +9,10 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/systemd"
-	"github.com/code-ready/crc/pkg/crc/systemd/states"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/systemd"
+	"github.com/crc-org/crc/pkg/crc/systemd/states"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 var nmPreflightChecks = []Check{
@@ -20,7 +20,7 @@ var nmPreflightChecks = []Check{
 		configKeySuffix:  "check-systemd-networkd-running",
 		checkDescription: "Checking if systemd-networkd is running",
 		check:            checkSystemdNetworkdIsNotRunning,
-		fixDescription:   "Network configuration with systemd-networkd is not supported. Perhaps you can try this new network mode: https://github.com/code-ready/crc/wiki/VPN-support--with-an--userland-network-stack",
+		fixDescription:   "Network configuration with systemd-networkd is not supported. Perhaps you can try this new network mode: https://github.com/crc-org/crc/wiki/VPN-support--with-an--userland-network-stack",
 		flags:            NoFix,
 
 		labels: labels{Os: Linux, NetworkMode: System},
diff --git a/pkg/crc/preflight/preflight_checks_nonlinux.go b/pkg/crc/preflight/preflight_checks_nonlinux.go
index f4e2e5c76..5fe4dbca1 100644
--- a/pkg/crc/preflight/preflight_checks_nonlinux.go
+++ b/pkg/crc/preflight/preflight_checks_nonlinux.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/daemonclient"
-	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/daemonclient"
+	crcerrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/shirou/gopsutil/v3/process"
 )
 
diff --git a/pkg/crc/preflight/preflight_checks_unix.go b/pkg/crc/preflight/preflight_checks_unix.go
index e7fca9975..074293d3f 100644
--- a/pkg/crc/preflight/preflight_checks_unix.go
+++ b/pkg/crc/preflight/preflight_checks_unix.go
@@ -11,13 +11,13 @@ import (
 	"runtime"
 	"syscall"
 
-	"github.com/code-ready/crc/pkg/crc/cache"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/validation"
-	"github.com/code-ready/crc/pkg/crc/version"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/cache"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/validation"
+	"github.com/crc-org/crc/pkg/crc/version"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 )
diff --git a/pkg/crc/preflight/preflight_checks_windows.go b/pkg/crc/preflight/preflight_checks_windows.go
index de9f52d04..ca9f13d1d 100644
--- a/pkg/crc/preflight/preflight_checks_windows.go
+++ b/pkg/crc/preflight/preflight_checks_windows.go
@@ -5,13 +5,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 
-	winnet "github.com/code-ready/crc/pkg/os/windows/network"
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
+	winnet "github.com/crc-org/crc/pkg/os/windows/network"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/hyperv"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/hyperv"
 )
 
 const (
diff --git a/pkg/crc/preflight/preflight_daemon_task_check_windows.go b/pkg/crc/preflight/preflight_daemon_task_check_windows.go
index b09c28678..2ffd13c58 100644
--- a/pkg/crc/preflight/preflight_daemon_task_check_windows.go
+++ b/pkg/crc/preflight/preflight_daemon_task_check_windows.go
@@ -9,10 +9,10 @@ import (
 	"os/user"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/version"
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/version"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
 )
 
 var (
diff --git a/pkg/crc/preflight/preflight_darwin.go b/pkg/crc/preflight/preflight_darwin.go
index df88422e7..b90fa84d8 100644
--- a/pkg/crc/preflight/preflight_darwin.go
+++ b/pkg/crc/preflight/preflight_darwin.go
@@ -3,11 +3,11 @@ package preflight
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/os/launchd"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/os/launchd"
 )
 
 // SetupHost performs the prerequisite checks and setups the host to run the cluster
diff --git a/pkg/crc/preflight/preflight_linux.go b/pkg/crc/preflight/preflight_linux.go
index 40297e3e7..ad48dc889 100644
--- a/pkg/crc/preflight/preflight_linux.go
+++ b/pkg/crc/preflight/preflight_linux.go
@@ -6,14 +6,14 @@ import (
 	"os"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	crcos "github.com/code-ready/crc/pkg/os"
-	"github.com/code-ready/crc/pkg/os/linux"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	crcos "github.com/crc-org/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/os/linux"
 
 	"golang.org/x/sys/unix"
 )
diff --git a/pkg/crc/preflight/preflight_ubuntu_linux.go b/pkg/crc/preflight/preflight_ubuntu_linux.go
index a1105c116..bdaa73f72 100644
--- a/pkg/crc/preflight/preflight_ubuntu_linux.go
+++ b/pkg/crc/preflight/preflight_ubuntu_linux.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 var ubuntuPreflightChecks = []Check{
diff --git a/pkg/crc/preflight/preflight_windows.go b/pkg/crc/preflight/preflight_windows.go
index b8042c799..46eac5126 100644
--- a/pkg/crc/preflight/preflight_windows.go
+++ b/pkg/crc/preflight/preflight_windows.go
@@ -6,12 +6,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
-	"github.com/code-ready/crc/pkg/os/windows/win32"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
+	"github.com/crc-org/crc/pkg/os/windows/win32"
 )
 
 var hypervPreflightChecks = []Check{
diff --git a/pkg/crc/preset/preset.go b/pkg/crc/preset/preset.go
index 99567838a..02e5ac13c 100644
--- a/pkg/crc/preset/preset.go
+++ b/pkg/crc/preset/preset.go
@@ -3,7 +3,7 @@ package preset
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 type Preset string
diff --git a/pkg/crc/segment/segment.go b/pkg/crc/segment/segment.go
index 892553e74..b35b7b4b5 100644
--- a/pkg/crc/segment/segment.go
+++ b/pkg/crc/segment/segment.go
@@ -16,13 +16,13 @@ import (
 	"strings"
 	"time"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/telemetry"
-	"github.com/code-ready/crc/pkg/crc/version"
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/pkg/crc/version"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/pborman/uuid"
 	"github.com/segmentio/analytics-go/v3"
 	"github.com/spf13/cast"
diff --git a/pkg/crc/segment/traits_darwin.go b/pkg/crc/segment/traits_darwin.go
index 6d2179565..32881a2d0 100644
--- a/pkg/crc/segment/traits_darwin.go
+++ b/pkg/crc/segment/traits_darwin.go
@@ -4,8 +4,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/version"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/version"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/segmentio/analytics-go/v3"
 )
 
diff --git a/pkg/crc/segment/traits_linux.go b/pkg/crc/segment/traits_linux.go
index c7be3df7b..21bbecf14 100644
--- a/pkg/crc/segment/traits_linux.go
+++ b/pkg/crc/segment/traits_linux.go
@@ -3,7 +3,7 @@ package segment
 import (
 	"runtime"
 
-	"github.com/code-ready/crc/pkg/os/linux"
+	"github.com/crc-org/crc/pkg/os/linux"
 	"github.com/segmentio/analytics-go/v3"
 )
 
diff --git a/pkg/crc/segment/traits_windows.go b/pkg/crc/segment/traits_windows.go
index e87cc8782..8d3c7217f 100644
--- a/pkg/crc/segment/traits_windows.go
+++ b/pkg/crc/segment/traits_windows.go
@@ -4,8 +4,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/version"
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
+	"github.com/crc-org/crc/pkg/crc/version"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
 	"github.com/segmentio/analytics-go/v3"
 )
 
diff --git a/pkg/crc/services/dns/dns.go b/pkg/crc/services/dns/dns.go
index 3c69be9f2..b7d273c48 100644
--- a/pkg/crc/services/dns/dns.go
+++ b/pkg/crc/services/dns/dns.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/adminhelper"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/services"
-	"github.com/code-ready/crc/pkg/crc/systemd"
-	"github.com/code-ready/crc/pkg/crc/systemd/states"
+	"github.com/crc-org/crc/pkg/crc/adminhelper"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/services"
+	"github.com/crc-org/crc/pkg/crc/systemd"
+	"github.com/crc-org/crc/pkg/crc/systemd/states"
 )
 
 const (
diff --git a/pkg/crc/services/dns/dns_darwin.go b/pkg/crc/services/dns/dns_darwin.go
index 4360e1cdf..491fbc9a3 100644
--- a/pkg/crc/services/dns/dns_darwin.go
+++ b/pkg/crc/services/dns/dns_darwin.go
@@ -9,11 +9,11 @@ import (
 	"text/template"
 	"time"
 
-	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/services"
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcerrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/services"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/services/dns/dns_linux.go b/pkg/crc/services/dns/dns_linux.go
index b31312e01..133ef526b 100644
--- a/pkg/crc/services/dns/dns_linux.go
+++ b/pkg/crc/services/dns/dns_linux.go
@@ -1,7 +1,7 @@
 package dns
 
 import (
-	"github.com/code-ready/crc/pkg/crc/services"
+	"github.com/crc-org/crc/pkg/crc/services"
 )
 
 func runPostStartForOS(serviceConfig services.ServicePostStartConfig) error {
diff --git a/pkg/crc/services/dns/dns_windows.go b/pkg/crc/services/dns/dns_windows.go
index 260090436..19633ac59 100644
--- a/pkg/crc/services/dns/dns_windows.go
+++ b/pkg/crc/services/dns/dns_windows.go
@@ -6,11 +6,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/services"
-	winnet "github.com/code-ready/crc/pkg/os/windows/network"
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
-	"github.com/code-ready/crc/pkg/os/windows/win32"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/services"
+	winnet "github.com/crc-org/crc/pkg/os/windows/network"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
+	"github.com/crc-org/crc/pkg/os/windows/win32"
 )
 
 const (
@@ -31,7 +31,7 @@ func runPostStartForOS(serviceConfig services.ServicePostStartConfig) error {
 	time.Sleep(2 * time.Second)
 
 	if !contains(getInterfaceNameserverValues(networkInterface), serviceConfig.IP) {
-		return fmt.Errorf("Nameserver %s not successfully set on interface %s. Perhaps you can try this new network mode: https://github.com/code-ready/crc/wiki/VPN-support--with-an--userland-network-stack", serviceConfig.IP, networkInterface)
+		return fmt.Errorf("Nameserver %s not successfully set on interface %s. Perhaps you can try this new network mode: https://github.com/crc-org/crc/wiki/VPN-support--with-an--userland-network-stack", serviceConfig.IP, networkInterface)
 	}
 	return nil
 }
diff --git a/pkg/crc/services/dns/template.go b/pkg/crc/services/dns/template.go
index cc62d87c1..ab15b568b 100644
--- a/pkg/crc/services/dns/template.go
+++ b/pkg/crc/services/dns/template.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"text/template"
 
-	"github.com/code-ready/crc/pkg/crc/services"
+	"github.com/crc-org/crc/pkg/crc/services"
 )
 
 const (
diff --git a/pkg/crc/services/services.go b/pkg/crc/services/services.go
index 123b4bbdd..247fe61fd 100644
--- a/pkg/crc/services/services.go
+++ b/pkg/crc/services/services.go
@@ -1,9 +1,9 @@
 package services
 
 import (
-	"github.com/code-ready/crc/pkg/crc/machine/bundle"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/ssh"
+	"github.com/crc-org/crc/pkg/crc/machine/bundle"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/ssh"
 )
 
 type ServicePostStartConfig struct {
diff --git a/pkg/crc/ssh/client.go b/pkg/crc/ssh/client.go
index 680ef1196..12149a47d 100644
--- a/pkg/crc/ssh/client.go
+++ b/pkg/crc/ssh/client.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	log "github.com/code-ready/crc/pkg/crc/logging"
+	log "github.com/crc-org/crc/pkg/crc/logging"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/pkg/crc/ssh/ssh.go b/pkg/crc/ssh/ssh.go
index c9aedad69..b402e431a 100644
--- a/pkg/crc/ssh/ssh.go
+++ b/pkg/crc/ssh/ssh.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 type Runner struct {
diff --git a/pkg/crc/systemd/systemd.go b/pkg/crc/systemd/systemd.go
index 6fb134f6f..77f2ede94 100644
--- a/pkg/crc/systemd/systemd.go
+++ b/pkg/crc/systemd/systemd.go
@@ -3,10 +3,10 @@ package systemd
 import (
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/crc/ssh"
-	"github.com/code-ready/crc/pkg/crc/systemd/actions"
-	"github.com/code-ready/crc/pkg/crc/systemd/states"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/ssh"
+	"github.com/crc-org/crc/pkg/crc/systemd/actions"
+	"github.com/crc-org/crc/pkg/crc/systemd/states"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 type Commander struct {
diff --git a/pkg/crc/systemd/systemd_linux.go b/pkg/crc/systemd/systemd_linux.go
index 4e5ce9cf5..743e107a2 100644
--- a/pkg/crc/systemd/systemd_linux.go
+++ b/pkg/crc/systemd/systemd_linux.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcos "github.com/crc-org/crc/pkg/os"
 )
 
 func NewHostSystemdCommander() *Commander {
diff --git a/pkg/crc/telemetry/telemetry.go b/pkg/crc/telemetry/telemetry.go
index 3c76e4e8d..9879b76c6 100644
--- a/pkg/crc/telemetry/telemetry.go
+++ b/pkg/crc/telemetry/telemetry.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
 )
 
 type contextKey struct{}
diff --git a/pkg/crc/tls/tls.go b/pkg/crc/tls/tls.go
index b55158cf8..bf693f0d6 100644
--- a/pkg/crc/tls/tls.go
+++ b/pkg/crc/tls/tls.go
@@ -16,7 +16,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/crc/tray/util_darwin.go b/pkg/crc/tray/util_darwin.go
index 6e032df79..d80e75f33 100644
--- a/pkg/crc/tray/util_darwin.go
+++ b/pkg/crc/tray/util_darwin.go
@@ -1,7 +1,7 @@
 package tray
 
 import (
-	"github.com/code-ready/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/config"
 )
 
 // ValidateTrayAutostart checks tray-auto-start is used in macOS and its a bool
diff --git a/pkg/crc/validation/validation.go b/pkg/crc/validation/validation.go
index b7581910a..f7377d4e5 100644
--- a/pkg/crc/validation/validation.go
+++ b/pkg/crc/validation/validation.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/image"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine/bundle"
-	crcpreset "github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/image"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine/bundle"
+	crcpreset "github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/docker/go-units"
 	"github.com/pbnjay/memory"
 )
diff --git a/pkg/crc/version/version.go b/pkg/crc/version/version.go
index e9b0d45d9..f48d4dadc 100644
--- a/pkg/crc/version/version.go
+++ b/pkg/crc/version/version.go
@@ -10,11 +10,11 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
 )
 
-// The following variables are private fields and should be set when compiling with ldflags, for example --ldflags="-X github.com/code-ready/crc/pkg/version.crcVersion=vX.Y.Z
+// The following variables are private fields and should be set when compiling with ldflags, for example --ldflags="-X github.com/crc-org/crc/pkg/version.crcVersion=vX.Y.Z
 var (
 	// The current version of minishift
 	crcVersion = "0.0.0-unset"
diff --git a/pkg/download/download.go b/pkg/download/download.go
index 28768a727..63f5b8cd2 100644
--- a/pkg/download/download.go
+++ b/pkg/download/download.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/network"
 
 	"github.com/cavaliergopher/grab/v3"
 	"github.com/cheggaaa/pb/v3"
diff --git a/pkg/drivers/hyperv/hyperv_windows.go b/pkg/drivers/hyperv/hyperv_windows.go
index 654418410..afe231942 100644
--- a/pkg/drivers/hyperv/hyperv_windows.go
+++ b/pkg/drivers/hyperv/hyperv_windows.go
@@ -7,9 +7,9 @@ import (
 	"os/exec"
 	"time"
 
-	log "github.com/code-ready/crc/pkg/crc/logging"
-	crcos "github.com/code-ready/crc/pkg/os"
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
+	log "github.com/crc-org/crc/pkg/crc/logging"
+	crcos "github.com/crc-org/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
 	"github.com/crc-org/machine/libmachine/drivers"
 	"github.com/crc-org/machine/libmachine/state"
 )
diff --git a/pkg/drivers/hyperv/powershell_windows.go b/pkg/drivers/hyperv/powershell_windows.go
index 7389ec168..9d7ff3410 100644
--- a/pkg/drivers/hyperv/powershell_windows.go
+++ b/pkg/drivers/hyperv/powershell_windows.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"strings"
 
-	log "github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
+	log "github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
 )
 
 var (
diff --git a/pkg/drivers/vfkit/driver_darwin.go b/pkg/drivers/vfkit/driver_darwin.go
index 1611b565b..568e66af2 100644
--- a/pkg/drivers/vfkit/driver_darwin.go
+++ b/pkg/drivers/vfkit/driver_darwin.go
@@ -27,7 +27,7 @@ import (
 	"syscall"
 	"time"
 
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/crc-org/machine/libmachine/drivers"
 	"github.com/crc-org/machine/libmachine/state"
 	"github.com/crc-org/vfkit/pkg/client"
diff --git a/pkg/embed/embed.go b/pkg/embed/embed.go
index a5bfab4ac..34f2ebede 100644
--- a/pkg/embed/embed.go
+++ b/pkg/embed/embed.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/YourFin/binappend"
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 func openEmbeddedFile(executablePath, embedName string) (io.ReadCloser, error) {
diff --git a/pkg/extract/extract.go b/pkg/extract/extract.go
index 65177879f..c6c61dc2b 100644
--- a/pkg/extract/extract.go
+++ b/pkg/extract/extract.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/cheggaaa/pb/v3"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/h2non/filetype"
 	"github.com/klauspost/compress/zstd"
 	"github.com/pkg/errors"
diff --git a/pkg/libmachine/host/host.go b/pkg/libmachine/host/host.go
index b22414c7d..99d1e31dc 100644
--- a/pkg/libmachine/host/host.go
+++ b/pkg/libmachine/host/host.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
-	log "github.com/code-ready/crc/pkg/crc/logging"
+	crcerrors "github.com/crc-org/crc/pkg/crc/errors"
+	log "github.com/crc-org/crc/pkg/crc/logging"
 	"github.com/crc-org/machine/libmachine/drivers"
 	"github.com/crc-org/machine/libmachine/state"
 )
diff --git a/pkg/libmachine/host/migrate.go b/pkg/libmachine/host/migrate.go
index 631000bd9..fb877eae9 100644
--- a/pkg/libmachine/host/migrate.go
+++ b/pkg/libmachine/host/migrate.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/code-ready/crc/pkg/drivers/none"
+	"github.com/crc-org/crc/pkg/drivers/none"
 )
 
 var (
diff --git a/pkg/libmachine/libmachine.go b/pkg/libmachine/libmachine.go
index a5e14ee57..5561d0ebd 100644
--- a/pkg/libmachine/libmachine.go
+++ b/pkg/libmachine/libmachine.go
@@ -3,8 +3,8 @@ package libmachine
 import (
 	"io"
 
-	"github.com/code-ready/crc/pkg/libmachine/host"
-	"github.com/code-ready/crc/pkg/libmachine/persist"
+	"github.com/crc-org/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/libmachine/persist"
 	rpcdriver "github.com/crc-org/machine/libmachine/drivers/rpc"
 )
 
diff --git a/pkg/libmachine/load_darwin.go b/pkg/libmachine/load_darwin.go
index b70d61753..bf897643b 100644
--- a/pkg/libmachine/load_darwin.go
+++ b/pkg/libmachine/load_darwin.go
@@ -3,8 +3,8 @@ package libmachine
 import (
 	"encoding/json"
 
-	"github.com/code-ready/crc/pkg/drivers/vfkit"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/drivers/vfkit"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 )
 
 func (api *Client) NewHost(driverName string, driverPath string, rawDriver []byte) (*host.Host, error) {
diff --git a/pkg/libmachine/load_linux.go b/pkg/libmachine/load_linux.go
index a6c9c4551..14e5c41d5 100644
--- a/pkg/libmachine/load_linux.go
+++ b/pkg/libmachine/load_linux.go
@@ -1,7 +1,7 @@
 package libmachine
 
 import (
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 )
 
 func (api *Client) NewHost(driverName string, driverPath string, rawDriver []byte) (*host.Host, error) {
diff --git a/pkg/libmachine/load_windows.go b/pkg/libmachine/load_windows.go
index d69b94f22..cf5393fe2 100644
--- a/pkg/libmachine/load_windows.go
+++ b/pkg/libmachine/load_windows.go
@@ -3,8 +3,8 @@ package libmachine
 import (
 	"encoding/json"
 
-	"github.com/code-ready/crc/pkg/drivers/hyperv"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/drivers/hyperv"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 )
 
 func (api *Client) NewHost(driverName string, driverPath string, rawDriver []byte) (*host.Host, error) {
diff --git a/pkg/libmachine/persist/filestore.go b/pkg/libmachine/persist/filestore.go
index 9d93d1cd5..286af29f8 100644
--- a/pkg/libmachine/persist/filestore.go
+++ b/pkg/libmachine/persist/filestore.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	log "github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 )
 
 type Filestore struct {
diff --git a/pkg/libmachine/persist/store.go b/pkg/libmachine/persist/store.go
index 5b89c16d8..2fbe7f866 100644
--- a/pkg/libmachine/persist/store.go
+++ b/pkg/libmachine/persist/store.go
@@ -1,7 +1,7 @@
 package persist
 
 import (
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 )
 
 type Store interface {
diff --git a/pkg/os/exec.go b/pkg/os/exec.go
index b9e579e32..d898157ee 100644
--- a/pkg/os/exec.go
+++ b/pkg/os/exec.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 func runCmd(command string, args []string, env map[string]string) (string, string, error) {
diff --git a/pkg/os/launchd/launchd_darwin.go b/pkg/os/launchd/launchd_darwin.go
index 6f05a8861..8d489b8df 100644
--- a/pkg/os/launchd/launchd_darwin.go
+++ b/pkg/os/launchd/launchd_darwin.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/os"
 )
 
 const (
diff --git a/pkg/os/linux/release_info.go b/pkg/os/linux/release_info.go
index 7a39c7c71..d8bedf8d0 100644
--- a/pkg/os/linux/release_info.go
+++ b/pkg/os/linux/release_info.go
@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 const releaseFile = "/etc/os-release"
diff --git a/pkg/os/util.go b/pkg/os/util.go
index 5f3ba86d6..c8ddb341c 100644
--- a/pkg/os/util.go
+++ b/pkg/os/util.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 
 	terminal "golang.org/x/term"
 )
diff --git a/pkg/os/util_unix.go b/pkg/os/util_unix.go
index 1110e09b9..3363d06b1 100644
--- a/pkg/os/util_unix.go
+++ b/pkg/os/util_unix.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 func WriteToFileAsRoot(reason, content, filepath string, mode os.FileMode) error {
diff --git a/pkg/os/windows/network/vswitch_windows.go b/pkg/os/windows/network/vswitch_windows.go
index f8f57f45a..cd6f3d395 100644
--- a/pkg/os/windows/network/vswitch_windows.go
+++ b/pkg/os/windows/network/vswitch_windows.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/os/windows/powershell"
+	"github.com/crc-org/crc/pkg/os/windows/powershell"
 )
 
 const hypervDefaultVirtualSwitchID = "c08cb7b8-9b3c-408e-8e30-5e16a3aeb444"
diff --git a/pkg/os/windows/powershell/powershell_windows.go b/pkg/os/windows/powershell/powershell_windows.go
index 0a1d4c272..5dcef3770 100644
--- a/pkg/os/windows/powershell/powershell_windows.go
+++ b/pkg/os/windows/powershell/powershell_windows.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 )
 
 var isAdminCmds = []string{
diff --git a/pkg/os/windows/win32/shell32_windows.go b/pkg/os/windows/win32/shell32_windows.go
index 6c805843a..6fe7a79c4 100644
--- a/pkg/os/windows/win32/shell32_windows.go
+++ b/pkg/os/windows/win32/shell32_windows.go
@@ -3,7 +3,7 @@ package win32
 import (
 	"syscall"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/logging"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/tools/go.mod b/tools/go.mod
index 675174b04..51f7c82c7 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,4 +1,4 @@
-module github.com/code-ready/crc/tools
+module github.com/crc-org/crc/tools
 
 go 1.17
 


Test patch:
diff --git a/cmd/crc/cmd/console_test.go b/cmd/crc/cmd/console_test.go
index d6cd29955..ea9fd5b65 100644
--- a/cmd/crc/cmd/console_test.go
+++ b/cmd/crc/cmd/console_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/machine/fakemachine"
+	"github.com/crc-org/crc/pkg/crc/machine/fakemachine"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/cmd/crc/cmd/delete_test.go b/cmd/crc/cmd/delete_test.go
index cca079b7d..d9a6de152 100644
--- a/cmd/crc/cmd/delete_test.go
+++ b/cmd/crc/cmd/delete_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/machine/fakemachine"
+	"github.com/crc-org/crc/pkg/crc/machine/fakemachine"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/cmd/crc/cmd/setup_test.go b/cmd/crc/cmd/setup_test.go
index d0c6853b2..d24d5c3d9 100644
--- a/cmd/crc/cmd/setup_test.go
+++ b/cmd/crc/cmd/setup_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/cmd/crc/cmd/start_test.go b/cmd/crc/cmd/start_test.go
index 2a9e7e39e..acfdb795e 100644
--- a/cmd/crc/cmd/start_test.go
+++ b/cmd/crc/cmd/start_test.go
@@ -6,9 +6,9 @@ import (
 	"runtime"
 	"testing"
 
-	crcErrors "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/os/shell"
+	crcErrors "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/os/shell"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/cmd/crc/cmd/status_test.go b/cmd/crc/cmd/status_test.go
index 7f89fe3e7..479319a70 100644
--- a/cmd/crc/cmd/status_test.go
+++ b/cmd/crc/cmd/status_test.go
@@ -9,13 +9,13 @@ import (
 	"strings"
 	"testing"
 
-	mocks "github.com/code-ready/crc/test/mocks/api"
+	mocks "github.com/crc-org/crc/test/mocks/api"
 
-	apiClient "github.com/code-ready/crc/pkg/crc/api/client"
-	"github.com/code-ready/crc/pkg/crc/daemonclient"
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	apiClient "github.com/crc-org/crc/pkg/crc/api/client"
+	"github.com/crc-org/crc/pkg/crc/daemonclient"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/preset"
 
 	"github.com/pkg/errors"
 
diff --git a/cmd/crc/cmd/stop_test.go b/cmd/crc/cmd/stop_test.go
index 421354f19..91b8dbc44 100644
--- a/cmd/crc/cmd/stop_test.go
+++ b/cmd/crc/cmd/stop_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/machine/fakemachine"
+	"github.com/crc-org/crc/pkg/crc/machine/fakemachine"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/compress/compress_test.go b/pkg/compress/compress_test.go
index 54c23bbcf..92014dcce 100644
--- a/pkg/compress/compress_test.go
+++ b/pkg/compress/compress_test.go
@@ -8,8 +8,8 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/extract"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/extract"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/crc/api/api_client_test.go b/pkg/crc/api/api_client_test.go
index b876b2e9f..eb52556a1 100644
--- a/pkg/crc/api/api_client_test.go
+++ b/pkg/crc/api/api_client_test.go
@@ -8,13 +8,13 @@ import (
 	"path/filepath"
 	"testing"
 
-	apiClient "github.com/code-ready/crc/pkg/crc/api/client"
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/fakemachine"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/version"
+	apiClient "github.com/crc-org/crc/pkg/crc/api/client"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/fakemachine"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/version"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/api/api_http_test.go b/pkg/crc/api/api_http_test.go
index fad8e219e..616a25aa2 100644
--- a/pkg/crc/api/api_http_test.go
+++ b/pkg/crc/api/api_http_test.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"testing"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine/fakemachine"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	"github.com/code-ready/crc/pkg/crc/version"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine/fakemachine"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/crc/api/helpers_test.go b/pkg/crc/api/helpers_test.go
index df6251620..84d31784e 100644
--- a/pkg/crc/api/helpers_test.go
+++ b/pkg/crc/api/helpers_test.go
@@ -3,8 +3,8 @@ package api
 import (
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/preflight"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/preflight"
 )
 
 func setupNewInMemoryConfig() *config.Config {
diff --git a/pkg/crc/cluster/pullsecret_test.go b/pkg/crc/cluster/pullsecret_test.go
index 88f623af4..94a7d8dfa 100644
--- a/pkg/crc/cluster/pullsecret_test.go
+++ b/pkg/crc/cluster/pullsecret_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/zalando/go-keyring"
 )
diff --git a/pkg/crc/config/viper_config_test.go b/pkg/crc/config/viper_config_test.go
index a6c94f965..011e5bfb3 100644
--- a/pkg/crc/config/viper_config_test.go
+++ b/pkg/crc/config/viper_config_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/crc/machine/bundle/copier_test.go b/pkg/crc/machine/bundle/copier_test.go
index 2ce95dbcb..391beda2a 100644
--- a/pkg/crc/machine/bundle/copier_test.go
+++ b/pkg/crc/machine/bundle/copier_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/machine/bundle/metadata_test.go b/pkg/crc/machine/bundle/metadata_test.go
index 04a53ff8a..5a7c130a5 100644
--- a/pkg/crc/machine/bundle/metadata_test.go
+++ b/pkg/crc/machine/bundle/metadata_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"unicode"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/preset"
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/crc/machine/bundle/repository_test.go b/pkg/crc/machine/bundle/repository_test.go
index 2dcab01a5..4657c29b4 100644
--- a/pkg/crc/machine/bundle/repository_test.go
+++ b/pkg/crc/machine/bundle/repository_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/constants"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/machine/sync_test.go b/pkg/crc/machine/sync_test.go
index ae3846aeb..7af30d4bc 100644
--- a/pkg/crc/machine/sync_test.go
+++ b/pkg/crc/machine/sync_test.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/machine/state"
-	"github.com/code-ready/crc/pkg/crc/machine/types"
-	crcPreset "github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/machine/state"
+	"github.com/crc-org/crc/pkg/crc/machine/types"
+	crcPreset "github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/oc/oc_linux_test.go b/pkg/crc/oc/oc_linux_test.go
index b63a197b1..8ff7d5f14 100644
--- a/pkg/crc/oc/oc_linux_test.go
+++ b/pkg/crc/oc/oc_linux_test.go
@@ -3,7 +3,7 @@ package oc
 import (
 	"testing"
 
-	crcos "github.com/code-ready/crc/pkg/os"
+	crcos "github.com/crc-org/crc/pkg/os"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/crc/preflight/preflight_darwin_test.go b/pkg/crc/preflight/preflight_darwin_test.go
index 27b516238..6b62f4684 100644
--- a/pkg/crc/preflight/preflight_darwin_test.go
+++ b/pkg/crc/preflight/preflight_darwin_test.go
@@ -3,10 +3,10 @@ package preflight
 import (
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/preflight/preflight_linux_test.go b/pkg/crc/preflight/preflight_linux_test.go
index 6c0a6c355..ddf1218d3 100644
--- a/pkg/crc/preflight/preflight_linux_test.go
+++ b/pkg/crc/preflight/preflight_linux_test.go
@@ -5,12 +5,12 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/cluster"
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	crcos "github.com/code-ready/crc/pkg/os/linux"
+	"github.com/crc-org/crc/pkg/crc/cluster"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	crcos "github.com/crc-org/crc/pkg/os/linux"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/preflight/preflight_test.go b/pkg/crc/preflight/preflight_test.go
index 342fa7d34..a86ae33db 100644
--- a/pkg/crc/preflight/preflight_test.go
+++ b/pkg/crc/preflight/preflight_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/preflight/preflight_ubuntu_linux_test.go b/pkg/crc/preflight/preflight_ubuntu_linux_test.go
index 5e8f6e242..fb272d35f 100644
--- a/pkg/crc/preflight/preflight_ubuntu_linux_test.go
+++ b/pkg/crc/preflight/preflight_ubuntu_linux_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/constants"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/preflight/preflight_windows_test.go b/pkg/crc/preflight/preflight_windows_test.go
index 904c678d5..79a273eb9 100644
--- a/pkg/crc/preflight/preflight_windows_test.go
+++ b/pkg/crc/preflight/preflight_windows_test.go
@@ -3,10 +3,10 @@ package preflight
 import (
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/crc/pkg/crc/preset"
+	"github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/network"
+	"github.com/crc-org/crc/pkg/crc/preset"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/crc/segment/segment_test.go b/pkg/crc/segment/segment_test.go
index 5b3ce5724..d65431408 100644
--- a/pkg/crc/segment/segment_test.go
+++ b/pkg/crc/segment/segment_test.go
@@ -13,11 +13,11 @@ import (
 	"testing"
 	"time"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	crcErr "github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/telemetry"
-	"github.com/code-ready/crc/pkg/crc/version"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	crcErr "github.com/crc-org/crc/pkg/crc/errors"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/telemetry"
+	"github.com/crc-org/crc/pkg/crc/version"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/crc/systemd/systemd_linux_test.go b/pkg/crc/systemd/systemd_linux_test.go
index 43dd0349f..d044165bd 100644
--- a/pkg/crc/systemd/systemd_linux_test.go
+++ b/pkg/crc/systemd/systemd_linux_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/systemd/states"
+	"github.com/crc-org/crc/pkg/crc/systemd/states"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/crc/telemetry/telemetry_test.go b/pkg/crc/telemetry/telemetry_test.go
index d46a7816f..b5885366b 100644
--- a/pkg/crc/telemetry/telemetry_test.go
+++ b/pkg/crc/telemetry/telemetry_test.go
@@ -6,7 +6,7 @@ import (
 	"os/user"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/constants"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/extract/extract_test.go b/pkg/extract/extract_test.go
index 3045de719..3ed2a592c 100644
--- a/pkg/extract/extract_test.go
+++ b/pkg/extract/extract_test.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	crcos "github.com/code-ready/crc/pkg/os"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	crcos "github.com/crc-org/crc/pkg/os"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/libmachine/host/migrate_test.go b/pkg/libmachine/host/migrate_test.go
index 6d1f9b3f3..d35c17a4a 100644
--- a/pkg/libmachine/host/migrate_test.go
+++ b/pkg/libmachine/host/migrate_test.go
@@ -3,7 +3,7 @@ package host
 import (
 	"testing"
 
-	"github.com/code-ready/crc/pkg/drivers/none"
+	"github.com/crc-org/crc/pkg/drivers/none"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/libmachine/persist/filestore_test.go b/pkg/libmachine/persist/filestore_test.go
index d6a478921..6c13691a4 100644
--- a/pkg/libmachine/persist/filestore_test.go
+++ b/pkg/libmachine/persist/filestore_test.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/code-ready/crc/pkg/drivers/none"
-	"github.com/code-ready/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/pkg/drivers/none"
+	"github.com/crc-org/crc/pkg/libmachine/host"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index bb1ce7c47..d853d3118 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/code-ready/crc/test/e2e/testsuite"
+	"github.com/crc-org/crc/test/e2e/testsuite"
 	"github.com/cucumber/godog"
 	"github.com/spf13/pflag"
 )
diff --git a/test/e2e/testsuite/testsuite.go b/test/e2e/testsuite/testsuite.go
index cee3cbaf4..34c37587a 100644
--- a/test/e2e/testsuite/testsuite.go
+++ b/test/e2e/testsuite/testsuite.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/preset"
-	crcCmd "github.com/code-ready/crc/test/extended/crc/cmd"
-	"github.com/code-ready/crc/test/extended/util"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/preset"
+	crcCmd "github.com/crc-org/crc/test/extended/crc/cmd"
+	"github.com/crc-org/crc/test/extended/util"
 	"github.com/cucumber/godog"
 	"github.com/spf13/pflag"
 )
diff --git a/test/extended/crc/cmd/cmd.go b/test/extended/crc/cmd/cmd.go
index 943d5e410..0ae4f8021 100644
--- a/test/extended/crc/cmd/cmd.go
+++ b/test/extended/crc/cmd/cmd.go
@@ -6,8 +6,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/test/extended/util"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/test/extended/util"
 )
 
 const (
diff --git a/test/extended/os/applescript/applescript.go b/test/extended/os/applescript/applescript.go
index 754041608..03bc3522f 100644
--- a/test/extended/os/applescript/applescript.go
+++ b/test/extended/os/applescript/applescript.go
@@ -10,7 +10,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/code-ready/crc/test/extended/util"
+	"github.com/crc-org/crc/test/extended/util"
 )
 
 func ExecuteApplescript(scriptFilename string, args ...string) error {
diff --git a/test/extended/util/collect.go b/test/extended/util/collect.go
index 8ea93b763..e936122e4 100644
--- a/test/extended/util/collect.go
+++ b/test/extended/util/collect.go
@@ -13,11 +13,11 @@ import (
 	"sync"
 	"time"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/crc/pkg/crc/machine"
-	"github.com/code-ready/crc/pkg/crc/ssh"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/logging"
+	"github.com/crc-org/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/ssh"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/semaphore"
 )
diff --git a/test/extended/util/util.go b/test/extended/util/util.go
index c3e3e4129..3fc38a6f8 100644
--- a/test/extended/util/util.go
+++ b/test/extended/util/util.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/code-ready/crc/pkg/download"
+	"github.com/crc-org/crc/pkg/download"
 )
 
 func CopyFilesToTestDir() error {
diff --git a/test/integration/utilities_test.go b/test/integration/utilities_test.go
index 8e7fb2bbb..4357fd0b5 100644
--- a/test/integration/utilities_test.go
+++ b/test/integration/utilities_test.go
@@ -11,10 +11,10 @@ import (
 	"syscall"
 	"time"
 
-	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
-	"github.com/code-ready/crc/pkg/crc/machine"
-	"github.com/code-ready/crc/pkg/crc/ssh"
+	crcConfig "github.com/crc-org/crc/pkg/crc/config"
+	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/pkg/crc/machine"
+	"github.com/crc-org/crc/pkg/crc/ssh"
 	. "github.com/onsi/gomega"
 	"github.com/sirupsen/logrus"
 )
diff --git a/test/mocks/api/client.go b/test/mocks/api/client.go
index 151fb5c32..566d8efa6 100644
--- a/test/mocks/api/client.go
+++ b/test/mocks/api/client.go
@@ -3,7 +3,7 @@
 package mocks
 
 import (
-	client "github.com/code-ready/crc/pkg/crc/api/client"
+	client "github.com/crc-org/crc/pkg/crc/api/client"
 	mock "github.com/stretchr/testify/mock"
 )