diff --git a/healthz/build/package/Dockerfile b/healthz/build/package/Dockerfile
index af43bdd..d652320 100644
--- a/healthz/build/package/Dockerfile
+++ b/healthz/build/package/Dockerfile
@@ -6,7 +6,6 @@ WORKDIR /src
 RUN go mod download
 
 COPY jsonfrontend/pkg/ /src/jsonfrontend/pkg/
-COPY xmlfrontend/pkg/ /src/xmlfrontend/pkg/
 COPY internal/internalprotocol /src/internal/internalprotocol
 
 COPY healthz /src/healthz
diff --git a/jsonfrontend/internal/server/encode/encode.go b/jsonfrontend/internal/server/encode/encode.go
index ac8a675..230cc65 100644
--- a/jsonfrontend/internal/server/encode/encode.go
+++ b/jsonfrontend/internal/server/encode/encode.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/metno/forti/internal/internalprotocol"
+	"github.com/metno/forti/internal/radar"
 	"github.com/metno/forti/jsonfrontend/internal/server/config"
 	"github.com/metno/forti/jsonfrontend/pkg/jsonformat"
-	"github.com/metno/forti/internal/radar"
 	"github.com/metno/go-weathersymbol"
 )
 
diff --git a/moxfrontend/build/package/Dockerfile b/moxfrontend/build/package/Dockerfile
index 7bbcfe0..dc4db3b 100644
--- a/moxfrontend/build/package/Dockerfile
+++ b/moxfrontend/build/package/Dockerfile
@@ -7,7 +7,6 @@ RUN go mod download
 
 COPY internal/internalprotocol /src/internal/internalprotocol
 COPY moxfrontend/internal /src/moxfrontend/internal
-COPY moxfrontend/pkg /src/moxfrontend/pkg
 
 RUN go test ./...
 
diff --git a/moxfrontend/pkg/mox/mox.go b/moxfrontend/internal/mox/mox.go
similarity index 100%
rename from moxfrontend/pkg/mox/mox.go
rename to moxfrontend/internal/mox/mox.go
diff --git a/moxfrontend/internal/server/encode/encode.go b/moxfrontend/internal/server/encode/encode.go
index 1ced43e..b25d09a 100644
--- a/moxfrontend/internal/server/encode/encode.go
+++ b/moxfrontend/internal/server/encode/encode.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/metno/forti/internal/internalprotocol"
-	"github.com/metno/forti/moxfrontend/pkg/mox"
+	"github.com/metno/forti/moxfrontend/internal/mox"
 )
 
 func EncodeNoData() *mox.ForecastDocument {
diff --git a/moxfrontend/internal/server/server.go b/moxfrontend/internal/server/server.go
index 82113f9..679ca1a 100644
--- a/moxfrontend/internal/server/server.go
+++ b/moxfrontend/internal/server/server.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/metno/forti/internal/internalprotocol"
+	"github.com/metno/forti/moxfrontend/internal/mox"
 	"github.com/metno/forti/moxfrontend/internal/server/encode"
-	"github.com/metno/forti/moxfrontend/pkg/mox"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/xmlfrontend/build/package/Dockerfile b/xmlfrontend/build/package/Dockerfile
index 44ff555..411d8de 100644
--- a/xmlfrontend/build/package/Dockerfile
+++ b/xmlfrontend/build/package/Dockerfile
@@ -7,7 +7,6 @@ RUN go mod download
 
 COPY internal/ /src/internal/
 COPY xmlfrontend/internal /src/xmlfrontend/internal
-COPY xmlfrontend/pkg /src/xmlfrontend/pkg
 
 RUN go test ./...
 
diff --git a/xmlfrontend/internal/server/encode/dataelement.go b/xmlfrontend/internal/server/encode/dataelement.go
index 48ecbce..c85841b 100644
--- a/xmlfrontend/internal/server/encode/dataelement.go
+++ b/xmlfrontend/internal/server/encode/dataelement.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
-	"github.com/metno/forti/xmlfrontend/pkg/xmlformat"
+	"github.com/metno/forti/xmlfrontend/internal/xmlformat"
 )
 
 func newDataElement(data *config.Parameter, value float32, allValues *map[string]float32) (xmlformat.DataElement, error) {
diff --git a/xmlfrontend/internal/server/encode/encode.go b/xmlfrontend/internal/server/encode/encode.go
index 5726366..1487a12 100644
--- a/xmlfrontend/internal/server/encode/encode.go
+++ b/xmlfrontend/internal/server/encode/encode.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
-	"github.com/metno/forti/xmlfrontend/pkg/xmlformat"
+	"github.com/metno/forti/xmlfrontend/internal/xmlformat"
 )
 
 func Encode(location *internalprotocol.GetForecastRequest, forecast *internalprotocol.Forecast) *xmlformat.ForecastDocument {
diff --git a/xmlfrontend/internal/server/server.go b/xmlfrontend/internal/server/server.go
index ae5dc3a..31854bf 100644
--- a/xmlfrontend/internal/server/server.go
+++ b/xmlfrontend/internal/server/server.go
@@ -16,7 +16,7 @@ import (
 	"github.com/metno/forti/internal/radar"
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
 	"github.com/metno/forti/xmlfrontend/internal/server/encode"
-	"github.com/metno/forti/xmlfrontend/pkg/xmlformat"
+	"github.com/metno/forti/xmlfrontend/internal/xmlformat"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/xmlfrontend/pkg/xmlformat/xmlformat.go b/xmlfrontend/internal/xmlformat/xmlformat.go
similarity index 100%
rename from xmlfrontend/pkg/xmlformat/xmlformat.go
rename to xmlfrontend/internal/xmlformat/xmlformat.go