diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index e638e09c9..fc2bc51a8 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Check out forklift repository
         uses: actions/checkout@v4
 
-      - run: ${{ matrix.shell }} ./virt-v2v/pkg/customize/scripts/rhel/run/test-network_config_util.sh
+      - run: ${{ matrix.shell }} ./pkg/virt-v2v/customize/scripts/rhel/run/test-network_config_util.sh
 
   ci_setup:
     strategy:
diff --git a/.tekton/virt-v2v-pull-request.yaml b/.tekton/virt-v2v-pull-request.yaml
index f6eb5b485..76aee0415 100644
--- a/.tekton/virt-v2v-pull-request.yaml
+++ b/.tekton/virt-v2v-pull-request.yaml
@@ -11,7 +11,8 @@ metadata:
       == "main" && ( ".tekton/virt-v2v-pull-request.yaml".pathChanged() ||
       ".tekton/virt-v2v-push.yaml".pathChanged() ||
       "build/virt-v2v/Containerfile".pathChanged() ||
-      "virt-v2v/***".pathChanged() ||
+      "pkg/virt-v2v/***".pathChanged() ||
+      "cmd/virt-v2v/***".pathChanged() ||
       "cmd/virt-v2v-monitor/***".pathChanged() )
   creationTimestamp: null
   labels:
diff --git a/.tekton/virt-v2v-push.yaml b/.tekton/virt-v2v-push.yaml
index 86940f1a0..96274d86f 100644
--- a/.tekton/virt-v2v-push.yaml
+++ b/.tekton/virt-v2v-push.yaml
@@ -12,7 +12,8 @@ metadata:
       == "main" && ( ".tekton/virt-v2v-pull-request.yaml".pathChanged() ||
       ".tekton/virt-v2v-push.yaml".pathChanged() ||
       "build/virt-v2v/Containerfile".pathChanged() ||
-      "virt-v2v/***".pathChanged() ||
+      "pkg/virt-v2v/***".pathChanged() ||
+      "cmd/virt-v2v/***".pathChanged() ||
       "cmd/virt-v2v-monitor/***".pathChanged() )
   creationTimestamp: null
   labels:
diff --git a/Makefile b/Makefile
index 5196c3771..2a7ccabdd 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ all: test forklift-controller
 
 # Run tests
 test: generate fmt vet manifests validation-test
-	go test -coverprofile=cover.out ./pkg/... ./cmd/... ./virt-v2v/...
+	go test -coverprofile=cover.out ./pkg/... ./cmd/...
 
 # Experimental e2e target
 e2e-sanity: e2e-sanity-ovirt e2e-sanity-vsphere
diff --git a/build/virt-v2v/Containerfile b/build/virt-v2v/Containerfile
index d710e7402..1184be38d 100644
--- a/build/virt-v2v/Containerfile
+++ b/build/virt-v2v/Containerfile
@@ -24,7 +24,7 @@ ENV GOEXPERIMENT strictfipsruntime
 
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-monitor github.com/konveyor/forklift-controller/cmd/virt-v2v-monitor
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o image-converter github.com/konveyor/forklift-controller/cmd/image-converter
-RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper virt-v2v/cmd/entrypoint.go
+RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper github.com/konveyor/forklift-controller/cmd/virt-v2v
 
 FROM registry.access.redhat.com/ubi9:9.5-1731517889
 
diff --git a/build/virt-v2v/Containerfile-upstream b/build/virt-v2v/Containerfile-upstream
index 71ef7c2a7..edf745afe 100644
--- a/build/virt-v2v/Containerfile-upstream
+++ b/build/virt-v2v/Containerfile-upstream
@@ -7,7 +7,7 @@ ENV GOEXPERIMENT strictfipsruntime
 
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-monitor ./cmd/virt-v2v-monitor/virt-v2v-monitor.go
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o image-converter ./cmd/image-converter/image-converter.go
-RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper ./virt-v2v/cmd/entrypoint.go
+RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper ./cmd/virt-v2v/entrypoint.go
 
 # Main container
 FROM quay.io/centos/centos:stream9-minimal
diff --git a/virt-v2v/cmd/entrypoint.go b/cmd/virt-v2v/entrypoint.go
similarity index 96%
rename from virt-v2v/cmd/entrypoint.go
rename to cmd/virt-v2v/entrypoint.go
index 9e421a8e1..3e5b73fda 100644
--- a/virt-v2v/cmd/entrypoint.go
+++ b/cmd/virt-v2v/entrypoint.go
@@ -10,10 +10,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/customize"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/server"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/customize"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/server"
+	utils "github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 func main() {
diff --git a/virt-v2v/cmd/entrypoint_test.go b/cmd/virt-v2v/entrypoint_test.go
similarity index 94%
rename from virt-v2v/cmd/entrypoint_test.go
rename to cmd/virt-v2v/entrypoint_test.go
index 7c497aa33..2933991ed 100644
--- a/virt-v2v/cmd/entrypoint_test.go
+++ b/cmd/virt-v2v/entrypoint_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
 )
 
 func TestStaticIPs(t *testing.T) {
diff --git a/virt-v2v/pkg/customize/image.go b/pkg/virt-v2v/customize/image.go
similarity index 92%
rename from virt-v2v/pkg/customize/image.go
rename to pkg/virt-v2v/customize/image.go
index bb4cacf47..837ab9275 100644
--- a/virt-v2v/pkg/customize/image.go
+++ b/pkg/virt-v2v/customize/image.go
@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 //go:embed scripts
diff --git a/virt-v2v/pkg/customize/rhel.go b/pkg/virt-v2v/customize/rhel.go
similarity index 96%
rename from virt-v2v/pkg/customize/rhel.go
rename to pkg/virt-v2v/customize/rhel.go
index 96076a96d..b6cbd5e18 100644
--- a/virt-v2v/pkg/customize/rhel.go
+++ b/pkg/virt-v2v/customize/rhel.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 func CustomizeLinux(execFunc DomainExecFunc, disks []string, dir string, t FileSystemTool) error {
diff --git a/virt-v2v/pkg/customize/rhel_test.go b/pkg/virt-v2v/customize/rhel_test.go
similarity index 99%
rename from virt-v2v/pkg/customize/rhel_test.go
rename to pkg/virt-v2v/customize/rhel_test.go
index 5d18bc1c8..30e589b46 100644
--- a/virt-v2v/pkg/customize/rhel_test.go
+++ b/pkg/virt-v2v/customize/rhel_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
 )
 
 type MockEmbedTool struct {
diff --git a/virt-v2v/pkg/customize/scripts/rhel/firstboot/README.md b/pkg/virt-v2v/customize/scripts/rhel/firstboot/README.md
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/firstboot/README.md
rename to pkg/virt-v2v/customize/scripts/rhel/firstboot/README.md
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/README.md b/pkg/virt-v2v/customize/scripts/rhel/run/README.md
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/README.md
rename to pkg/virt-v2v/customize/scripts/rhel/run/README.md
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0 b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-double-quotes-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/etc/sysconfig/network-scripts/ifcfg-eth0 b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test-failure.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens192 b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens192
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens192
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens192
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens224 b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens224
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens224
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/etc/sysconfig/network-scripts/ifcfg-ens224
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-hwaddr-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0 b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-no-quotes-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0 b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/ifcfg-single-quotes-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/etc/netplan/50-netplan.yaml b/pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/etc/netplan/50-netplan.yaml
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/etc/netplan/50-netplan.yaml
rename to pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/etc/netplan/50-netplan.yaml
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-enp3s0.network b/pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-enp3s0.network
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-enp3s0.network
rename to pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-enp3s0.network
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-eth1.network b/pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-eth1.network
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-eth1.network
rename to pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/run/systemd/network/netplan-eth1.network
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/netplan-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/netplan-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-ens192 b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-ens192
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-ens192
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-ens192
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-eth0 b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-eth0
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-eth0
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/etc/network/interfaces.d/if-eth0
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-multiple-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-single-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-single-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-single-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-single-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-single-test.d/root/etc/network/interfaces b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-single-test.d/root/etc/network/interfaces
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-single-test.d/root/etc/network/interfaces
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-single-test.d/root/etc/network/interfaces
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-single-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-single-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network-interfaces-single-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/network-interfaces-single-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/network_config_util.sh b/pkg/virt-v2v/customize/scripts/rhel/run/network_config_util.sh
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/network_config_util.sh
rename to pkg/virt-v2v/customize/scripts/rhel/run/network_config_util.sh
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/networkmanager-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/networkmanager-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/networkmanager-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/networkmanager-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/networkmanager-test.d/root/etc/NetworkManager/system-connections/eth1 but with spaces.nmconnection b/pkg/virt-v2v/customize/scripts/rhel/run/networkmanager-test.d/root/etc/NetworkManager/system-connections/eth1 but with spaces.nmconnection
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/networkmanager-test.d/root/etc/NetworkManager/system-connections/eth1 but with spaces.nmconnection
rename to pkg/virt-v2v/customize/scripts/rhel/run/networkmanager-test.d/root/etc/NetworkManager/system-connections/eth1 but with spaces.nmconnection
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/networkmanager-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/networkmanager-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/networkmanager-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/networkmanager-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/expected-udev.rule b/pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/expected-udev.rule
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/expected-udev.rule
rename to pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/expected-udev.rule
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/root/etc/netplan/50-netplan.yaml b/pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/root/etc/netplan/50-netplan.yaml
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/root/etc/netplan/50-netplan.yaml
rename to pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/root/etc/netplan/50-netplan.yaml
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/root/run/systemd/network/netplan-ens160.network b/pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/root/run/systemd/network/netplan-ens160.network
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/root/run/systemd/network/netplan-ens160.network
rename to pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/root/run/systemd/network/netplan-ens160.network
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/root/tmp/macToIP b/pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/root/tmp/macToIP
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/systemd-test.d/root/tmp/macToIP
rename to pkg/virt-v2v/customize/scripts/rhel/run/systemd-test.d/root/tmp/macToIP
diff --git a/virt-v2v/pkg/customize/scripts/rhel/run/test-network_config_util.sh b/pkg/virt-v2v/customize/scripts/rhel/run/test-network_config_util.sh
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/rhel/run/test-network_config_util.sh
rename to pkg/virt-v2v/customize/scripts/rhel/run/test-network_config_util.sh
diff --git a/virt-v2v/pkg/customize/scripts/windows/9999-restore_config.ps1 b/pkg/virt-v2v/customize/scripts/windows/9999-restore_config.ps1
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/windows/9999-restore_config.ps1
rename to pkg/virt-v2v/customize/scripts/windows/9999-restore_config.ps1
diff --git a/virt-v2v/pkg/customize/scripts/windows/9999-run-mtv-ps-scripts.bat b/pkg/virt-v2v/customize/scripts/windows/9999-run-mtv-ps-scripts.bat
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/windows/9999-run-mtv-ps-scripts.bat
rename to pkg/virt-v2v/customize/scripts/windows/9999-run-mtv-ps-scripts.bat
diff --git a/virt-v2v/pkg/customize/scripts/windows/firstboot.bat b/pkg/virt-v2v/customize/scripts/windows/firstboot.bat
similarity index 100%
rename from virt-v2v/pkg/customize/scripts/windows/firstboot.bat
rename to pkg/virt-v2v/customize/scripts/windows/firstboot.bat
diff --git a/virt-v2v/pkg/customize/testdata/valid_config.xml b/pkg/virt-v2v/customize/testdata/valid_config.xml
similarity index 100%
rename from virt-v2v/pkg/customize/testdata/valid_config.xml
rename to pkg/virt-v2v/customize/testdata/valid_config.xml
diff --git a/virt-v2v/pkg/customize/testdata/valid_config.yml b/pkg/virt-v2v/customize/testdata/valid_config.yml
similarity index 100%
rename from virt-v2v/pkg/customize/testdata/valid_config.yml
rename to pkg/virt-v2v/customize/testdata/valid_config.yml
diff --git a/virt-v2v/pkg/customize/utils.go b/pkg/virt-v2v/customize/utils.go
similarity index 96%
rename from virt-v2v/pkg/customize/utils.go
rename to pkg/virt-v2v/customize/utils.go
index 6ae00cbe8..d76735dd5 100644
--- a/virt-v2v/pkg/customize/utils.go
+++ b/pkg/virt-v2v/customize/utils.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 // getScriptsWithSuffix retrieves all scripts with suffix from the specified directory
diff --git a/virt-v2v/pkg/customize/windows.go b/pkg/virt-v2v/customize/windows.go
similarity index 95%
rename from virt-v2v/pkg/customize/windows.go
rename to pkg/virt-v2v/customize/windows.go
index f1af89cfa..9b39e7284 100644
--- a/virt-v2v/pkg/customize/windows.go
+++ b/pkg/virt-v2v/customize/windows.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 // CustomizeWindows customizes a windows disk image by uploading scripts.
diff --git a/virt-v2v/pkg/global/variables.go b/pkg/virt-v2v/global/variables.go
similarity index 100%
rename from virt-v2v/pkg/global/variables.go
rename to pkg/virt-v2v/global/variables.go
diff --git a/virt-v2v/pkg/server/server.go b/pkg/virt-v2v/server/server.go
similarity index 95%
rename from virt-v2v/pkg/server/server.go
rename to pkg/virt-v2v/server/server.go
index 23cdbbde2..7acd74df8 100644
--- a/virt-v2v/pkg/server/server.go
+++ b/pkg/virt-v2v/server/server.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 var (
diff --git a/virt-v2v/pkg/utils/command.go b/pkg/virt-v2v/utils/command.go
similarity index 98%
rename from virt-v2v/pkg/utils/command.go
rename to pkg/virt-v2v/utils/command.go
index 45ea6dcbd..31269f882 100644
--- a/virt-v2v/pkg/utils/command.go
+++ b/pkg/virt-v2v/utils/command.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
 )
 
 func CheckEnvVariablesSet(envVars ...string) bool {
diff --git a/virt-v2v/pkg/utils/embed-tool.go b/pkg/virt-v2v/utils/embed-tool.go
similarity index 100%
rename from virt-v2v/pkg/utils/embed-tool.go
rename to pkg/virt-v2v/utils/embed-tool.go
diff --git a/virt-v2v/pkg/utils/utils_test.go b/pkg/virt-v2v/utils/utils_test.go
similarity index 100%
rename from virt-v2v/pkg/utils/utils_test.go
rename to pkg/virt-v2v/utils/utils_test.go
diff --git a/virt-v2v/pkg/utils/xml-reader.go b/pkg/virt-v2v/utils/xml-reader.go
similarity index 100%
rename from virt-v2v/pkg/utils/xml-reader.go
rename to pkg/virt-v2v/utils/xml-reader.go