diff --git a/cmd/go2tv-lite/go2tv.go b/cmd/go2tv-lite/go2tv.go
index 51f21c8..5c11a64 100644
--- a/cmd/go2tv-lite/go2tv.go
+++ b/cmd/go2tv-lite/go2tv.go
@@ -20,7 +20,7 @@ import (
 	"github.com/alexballas/go2tv/devices"
 	"github.com/alexballas/go2tv/httphandlers"
 	"github.com/alexballas/go2tv/soapcalls"
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 )
 
 var (
diff --git a/cmd/go2tv/go2tv.go b/cmd/go2tv/go2tv.go
index 688e9ce..70701af 100644
--- a/cmd/go2tv/go2tv.go
+++ b/cmd/go2tv/go2tv.go
@@ -23,7 +23,7 @@ import (
 	"github.com/alexballas/go2tv/internal/gui"
 	"github.com/alexballas/go2tv/internal/interactive"
 	"github.com/alexballas/go2tv/soapcalls"
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 )
 
 var (
diff --git a/httphandlers/httphandlers.go b/httphandlers/httphandlers.go
index fca050f..5b3f862 100644
--- a/httphandlers/httphandlers.go
+++ b/httphandlers/httphandlers.go
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/alexballas/go2tv/soapcalls"
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 )
 
 // HTTPserver - new http.Server instance.
diff --git a/internal/gui/actions.go b/internal/gui/actions.go
index 725138c..c4f29bd 100644
--- a/internal/gui/actions.go
+++ b/internal/gui/actions.go
@@ -24,7 +24,7 @@ import (
 	"github.com/alexballas/go2tv/devices"
 	"github.com/alexballas/go2tv/httphandlers"
 	"github.com/alexballas/go2tv/soapcalls"
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 	"github.com/pkg/errors"
 	"github.com/skratchdot/open-golang/open"
 )
diff --git a/internal/gui/actions_mobile.go b/internal/gui/actions_mobile.go
index 1385d5a..087acac 100644
--- a/internal/gui/actions_mobile.go
+++ b/internal/gui/actions_mobile.go
@@ -19,7 +19,7 @@ import (
 	"github.com/alexballas/go2tv/devices"
 	"github.com/alexballas/go2tv/httphandlers"
 	"github.com/alexballas/go2tv/soapcalls"
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 	"github.com/pkg/errors"
 )
 
diff --git a/internal/gui/main.go b/internal/gui/main.go
index ae34182..3115bb3 100644
--- a/internal/gui/main.go
+++ b/internal/gui/main.go
@@ -22,7 +22,7 @@ import (
 	"fyne.io/fyne/v2/widget"
 	"github.com/alexballas/go2tv/devices"
 	"github.com/alexballas/go2tv/soapcalls"
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 	"golang.org/x/time/rate"
 )
 
diff --git a/internal/gui/main_mobile.go b/internal/gui/main_mobile.go
index 6532e9e..8393ff2 100644
--- a/internal/gui/main_mobile.go
+++ b/internal/gui/main_mobile.go
@@ -17,7 +17,7 @@ import (
 	"fyne.io/fyne/v2/widget"
 	"github.com/alexballas/go2tv/devices"
 	"github.com/alexballas/go2tv/soapcalls"
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 )
 
 func mainWindow(s *NewScreen) fyne.CanvasObject {
diff --git a/soapcalls/soapbuilders.go b/soapcalls/soapbuilders.go
index 3446c04..e474b7a 100644
--- a/soapcalls/soapbuilders.go
+++ b/soapcalls/soapbuilders.go
@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 	"github.com/pkg/errors"
 )
 
diff --git a/soapcalls/soapbuilders_test.go b/soapcalls/soapbuilders_test.go
index 97236bb..ac97392 100644
--- a/soapcalls/soapbuilders_test.go
+++ b/soapcalls/soapbuilders_test.go
@@ -3,7 +3,7 @@ package soapcalls
 import (
 	"testing"
 
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 )
 
 func TestSetAVTransportSoapBuild(t *testing.T) {
diff --git a/soapcalls/soapcalls.go b/soapcalls/soapcalls.go
index 6190bd6..4fc3311 100644
--- a/soapcalls/soapcalls.go
+++ b/soapcalls/soapcalls.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/alexballas/go2tv/utils"
+	"github.com/alexballas/go2tv/soapcalls/utils"
 )
 
 type Options struct {
diff --git a/utils/dlnatools.go b/soapcalls/utils/dlnatools.go
similarity index 100%
rename from utils/dlnatools.go
rename to soapcalls/utils/dlnatools.go
diff --git a/utils/dlnatools_test.go b/soapcalls/utils/dlnatools_test.go
similarity index 100%
rename from utils/dlnatools_test.go
rename to soapcalls/utils/dlnatools_test.go
diff --git a/utils/ffprobe.go b/soapcalls/utils/ffprobe.go
similarity index 100%
rename from utils/ffprobe.go
rename to soapcalls/utils/ffprobe.go
diff --git a/utils/ffprobe_windows.go b/soapcalls/utils/ffprobe_windows.go
similarity index 100%
rename from utils/ffprobe_windows.go
rename to soapcalls/utils/ffprobe_windows.go
diff --git a/utils/iptools.go b/soapcalls/utils/iptools.go
similarity index 100%
rename from utils/iptools.go
rename to soapcalls/utils/iptools.go
diff --git a/utils/iptools_test.go b/soapcalls/utils/iptools_test.go
similarity index 100%
rename from utils/iptools_test.go
rename to soapcalls/utils/iptools_test.go
diff --git a/utils/random.go b/soapcalls/utils/random.go
similarity index 100%
rename from utils/random.go
rename to soapcalls/utils/random.go
diff --git a/utils/random_test.go b/soapcalls/utils/random_test.go
similarity index 100%
rename from utils/random_test.go
rename to soapcalls/utils/random_test.go
diff --git a/utils/transcode.go b/soapcalls/utils/transcode.go
similarity index 100%
rename from utils/transcode.go
rename to soapcalls/utils/transcode.go
diff --git a/utils/transcode_windows.go b/soapcalls/utils/transcode_windows.go
similarity index 100%
rename from utils/transcode_windows.go
rename to soapcalls/utils/transcode_windows.go
diff --git a/utils/urlencoder.go b/soapcalls/utils/urlencoder.go
similarity index 100%
rename from utils/urlencoder.go
rename to soapcalls/utils/urlencoder.go
diff --git a/utils/urlencoder_test.go b/soapcalls/utils/urlencoder_test.go
similarity index 100%
rename from utils/urlencoder_test.go
rename to soapcalls/utils/urlencoder_test.go
diff --git a/utils/urlstreamer.go b/soapcalls/utils/urlstreamer.go
similarity index 100%
rename from utils/urlstreamer.go
rename to soapcalls/utils/urlstreamer.go