diff --git a/builder/xenserver/common/step_get_vnc_port.go b/builder/xenserver/common/step_get_vnc_port.go
index 33b20da..b92dbbe 100644
--- a/builder/xenserver/common/step_get_vnc_port.go
+++ b/builder/xenserver/common/step_get_vnc_port.go
@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 	config2 "github.com/xenserver/packer-builder-xenserver/builder/xenserver/common/config"
 	"github.com/xenserver/packer-builder-xenserver/builder/xenserver/common/proxy"
+	"github.com/xenserver/packer-builder-xenserver/builder/xenserver/common/vnc"
 	"github.com/xenserver/packer-builder-xenserver/builder/xenserver/common/xen"
 	"net"
 	"strconv"
@@ -28,14 +29,14 @@ func (self *StepGetVNCPort) Run(ctx context.Context, state multistep.StateBag) m
 
 	ui.Say("Step: forward the instances VNC")
 
-	location, err := GetVNCConsoleLocation(state)
+	location, err := vnc.GetVNCConsoleLocation(state)
 	if err != nil {
 		state.Put("error", err)
 		ui.Error(err.Error())
 		return multistep.ActionHalt
 	}
 
-	target, err := GetTcpAddressFromURL(location)
+	target, err := vnc.GetTcpAddressFromURL(location)
 	if err != nil {
 		state.Put("error", err)
 		ui.Error(err.Error())
@@ -59,7 +60,7 @@ func (self *StepGetVNCPort) Run(ctx context.Context, state multistep.StateBag) m
 	}
 
 	self.forwarding = xenProxy.CreateWrapperForwarding(host, port, func(rawConn net.Conn) (net.Conn, error) {
-		return initializeVNCConnection(location, string(xenClient.GetSessionRef()), rawConn)
+		return vnc.InitializeVNCConnection(location, string(xenClient.GetSessionRef()), rawConn)
 	})
 
 	err = self.forwarding.Start()
diff --git a/builder/xenserver/common/step_type_boot_command.go b/builder/xenserver/common/step_type_boot_command.go
index 1217752..66421d6 100644
--- a/builder/xenserver/common/step_type_boot_command.go
+++ b/builder/xenserver/common/step_type_boot_command.go
@@ -12,6 +12,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	config2 "github.com/xenserver/packer-builder-xenserver/builder/xenserver/common/config"
+	"github.com/xenserver/packer-builder-xenserver/builder/xenserver/common/vnc"
 	"log"
 )
 
@@ -46,7 +47,7 @@ func (self *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateB
 		httpIP = state.Get("http_ip").(string)
 	}
 
-	location, err := GetVNCConsoleLocation(state)
+	location, err := vnc.GetVNCConsoleLocation(state)
 	if err != nil {
 		state.Put("error", err)
 		ui.Error(err.Error())
@@ -55,7 +56,7 @@ func (self *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateB
 
 	ui.Say(fmt.Sprintf("Connecting to the VM console VNC over xapi via %s", location))
 
-	vncClient, err := CreateVNCClient(state, location)
+	vncClient, err := vnc.CreateVNCClient(state, location)
 
 	if err != nil {
 		ui.Error(err.Error())
diff --git a/builder/xenserver/common/vnc.go b/builder/xenserver/common/vnc/vnc.go
similarity index 96%
rename from builder/xenserver/common/vnc.go
rename to builder/xenserver/common/vnc/vnc.go
index a9e1e79..4cfc469 100644
--- a/builder/xenserver/common/vnc.go
+++ b/builder/xenserver/common/vnc/vnc.go
@@ -1,4 +1,4 @@
-package common
+package vnc
 
 import (
 	"crypto/tls"
@@ -64,7 +64,7 @@ func CreateVNCConnection(state multistep.StateBag, location string) (net.Conn, e
 		return nil, err
 	}
 
-	tlsConn, err := initializeVNCConnection(location, string(xenClient.GetSessionRef()), rawConn)
+	tlsConn, err := InitializeVNCConnection(location, string(xenClient.GetSessionRef()), rawConn)
 	if err != nil {
 		rawConn.Close()
 		return nil, err
@@ -92,7 +92,7 @@ func CreateVNCClient(state multistep.StateBag, location string) (*vnc.ClientConn
 	return client, nil
 }
 
-func initializeVNCConnection(location string, xenSessionRef string, rawConn net.Conn) (*tls.Conn, error) {
+func InitializeVNCConnection(location string, xenSessionRef string, rawConn net.Conn) (*tls.Conn, error) {
 	tlsConfig := &tls.Config{
 		InsecureSkipVerify: true,
 	}