diff --git a/cli/cmd_suggestion.go b/cli/cmd_suggestion.go
index 096da4926b637b0eecce9978f23bc716db655f0f..2454b35367bd820079a599e540514293e5dd30ba 100644
--- a/cli/cmd_suggestion.go
+++ b/cli/cmd_suggestion.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	levenshtein "github.com/texttheater/golang-levenshtein/levenshtein"
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 // Make a custom slice that can be sorted by its levenshtein value
diff --git a/cli/helptext.go b/cli/helptext.go
index 8c88b33b1d0011e0775e51c32f61c41861072af6..64465de982fbb18ae20d9a59079215258b5a384d 100644
--- a/cli/helptext.go
+++ b/cli/helptext.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/template"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
diff --git a/cli/helptext_test.go b/cli/helptext_test.go
index e59db69ddad8863a132539387bd3677f22b354bf..3e51b2c6a95520d8a3049ebf28aa746fe52074b5 100644
--- a/cli/helptext_test.go
+++ b/cli/helptext_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 func TestSynopsisGenerator(t *testing.T) {
diff --git a/cli/parse.go b/cli/parse.go
index 2d283fbdd3a0656dac3b38d555613cd893c858b3..eb8d8e99f91f9eb23b1f53ea4bbdd0310d078ff9 100644
--- a/cli/parse.go
+++ b/cli/parse.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 
 	osh "github.com/Kubuxu/go-os-helper"
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
+	logging "gitlab.dms3.io/dms3/go-log"
 )
 
 var log = logging.Logger("cmds/cli")
diff --git a/cli/parse_test.go b/cli/parse_test.go
index 9ddfd1d1e91bf53e2cd46773654a348c2acfad3a..8a43d81fbb30eca31cfabe06e7c8e971b2546375 100644
--- a/cli/parse_test.go
+++ b/cli/parse_test.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"testing"
 
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 type kvs map[string]interface{}
diff --git a/cli/responseemitter.go b/cli/responseemitter.go
index 821aa8cee7bbc678cda79ced061a51063a718ec4..bd2ac18cacab4ebda4cf973ab34fb914607b5628 100644
--- a/cli/responseemitter.go
+++ b/cli/responseemitter.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"sync"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 var _ ResponseEmitter = &responseEmitter{}
diff --git a/cli/responseemitter_test.go b/cli/responseemitter_test.go
index 4daf8096fd005276a6df4eb58a07520d51b42740..8882cb2c7b7f05e1ed27dbeb54b5db066cfc0f99 100644
--- a/cli/responseemitter_test.go
+++ b/cli/responseemitter_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 type tcCloseWithError struct {
diff --git a/cli/run.go b/cli/run.go
index 3aa31959f4b55faf581a61ed3c8e2d7326c4ac9f..fd6faa538151a1343355349af57dc3b422274b9f 100644
--- a/cli/run.go
+++ b/cli/run.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 // ExitError is the error used when a specific exit code needs to be returned.
diff --git a/cli/run_test.go b/cli/run_test.go
index 176acb3d04d1cb10d6e8b9c119fb2ca622d764e2..f39f7c1a3bd628eb9a805482e99d75bc99267417 100644
--- a/cli/run_test.go
+++ b/cli/run_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 var root = &cmds.Command{
diff --git a/cli/single_test.go b/cli/single_test.go
index 4bf8a296c2664353298a6f35d30a9d9789f83181..293b86ee934029a6a1c8c28e051c7b405fb6b237 100644
--- a/cli/single_test.go
+++ b/cli/single_test.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 func TestSingle(t *testing.T) {
diff --git a/command.go b/command.go
index 034d3f68865a667b9ddf587d9f804fa32d154d8e..51661c6edb6a9b2085c6ff9de152f5596117bfee 100644
--- a/command.go
+++ b/command.go
@@ -13,9 +13,9 @@ import (
 	"fmt"
 	"strings"
 
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
 
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	logging "gitlab.dms3.io/dms3/go-log"
 )
 
 // DefaultOutputEncoding defines the default API output encoding.
diff --git a/doc.go b/doc.go
index 55e9af771254c2ccd41884f60cb253767c7694c2..b5a268fcb78639e3d8ab6f0e199ca62c7832fba9 100644
--- a/doc.go
+++ b/doc.go
@@ -87,7 +87,7 @@
 
 	To get a better idea of what's going on, take a look at the
 	examples at
-	https://gitlab.dms3.io/dms3/public/go-dms3-cmds/tree/master/examples.
+	https://gitlab.dms3.io/dms3/go-dms3-cmds/tree/master/examples.
 
 */
 package cmds
diff --git a/examples/adder/cmd.go b/examples/adder/cmd.go
index 3f8aefe31b1f2c93460b5c60b275b52bb7b09d37..5e36074807cca20f2879ec1301f254431462e3ac 100644
--- a/examples/adder/cmd.go
+++ b/examples/adder/cmd.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	"gitlab.dms3.io/dms3/public/go-dms3-cmds/cli"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	"gitlab.dms3.io/dms3/go-dms3-cmds/cli"
 )
 
 // AddStatus describes the progress of the add operation
diff --git a/examples/adder/local/main.go b/examples/adder/local/main.go
index e1e8aba789642899aa91638aaf3f7357547b5c25..a3c028a742dbbc34f0a5299579e7b54516cba65b 100644
--- a/examples/adder/local/main.go
+++ b/examples/adder/local/main.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"os"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	"gitlab.dms3.io/dms3/public/go-dms3-cmds/examples/adder"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	"gitlab.dms3.io/dms3/go-dms3-cmds/examples/adder"
 
-	"gitlab.dms3.io/dms3/public/go-dms3-cmds/cli"
+	"gitlab.dms3.io/dms3/go-dms3-cmds/cli"
 )
 
 func main() {
diff --git a/examples/adder/remote/client/main.go b/examples/adder/remote/client/main.go
index 2c9179e2a81fd357a025f41553788f67b62fc679..4e0c50b5f2f6586bda2bd48040b83c6b1a140b26 100644
--- a/examples/adder/remote/client/main.go
+++ b/examples/adder/remote/client/main.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"os"
 
-	"gitlab.dms3.io/dms3/public/go-dms3-cmds/examples/adder"
+	"gitlab.dms3.io/dms3/go-dms3-cmds/examples/adder"
 
-	//cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	cli "gitlab.dms3.io/dms3/public/go-dms3-cmds/cli"
-	http "gitlab.dms3.io/dms3/public/go-dms3-cmds/http"
+	//cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	cli "gitlab.dms3.io/dms3/go-dms3-cmds/cli"
+	http "gitlab.dms3.io/dms3/go-dms3-cmds/http"
 )
 
 func main() {
diff --git a/examples/adder/remote/server/main.go b/examples/adder/remote/server/main.go
index 793bca19b56d6488910a44f120f015c452478e3a..9c8c3a5bd7438a2e33042ee98e25aa84e58849f1 100644
--- a/examples/adder/remote/server/main.go
+++ b/examples/adder/remote/server/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	nethttp "net/http"
 
-	"gitlab.dms3.io/dms3/public/go-dms3-cmds/examples/adder"
+	"gitlab.dms3.io/dms3/go-dms3-cmds/examples/adder"
 
-	http "gitlab.dms3.io/dms3/public/go-dms3-cmds/http"
+	http "gitlab.dms3.io/dms3/go-dms3-cmds/http"
 )
 
 type env struct{}
diff --git a/go.mod b/go.mod
index 8aba9d253040ce31411874c409ae5f7305e07b17..f761cafbccf8fda7e5225377c6a0c13893f44421 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module gitlab.dms3.io/dms3/public/go-dms3-cmds
+module gitlab.dms3.io/dms3/go-dms3-cmds
 
 go 1.15
 
@@ -6,7 +6,7 @@ require (
 	github.com/Kubuxu/go-os-helper v0.0.1
 	github.com/rs/cors v1.7.0
 	github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e
-	gitlab.dms3.io/dms3/public/go-dms3-files v0.0.1
-	gitlab.dms3.io/dms3/public/go-log v0.0.1
+	gitlab.dms3.io/dms3/go-dms3-files v0.0.2
+	gitlab.dms3.io/dms3/go-log v0.0.2
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 )
diff --git a/go.sum b/go.sum
index 9fb6d49fad5668d05569e49bb6a6def2ded106de..694e2cf2dd381aeac030d92d67879ab64c1e5de9 100644
--- a/go.sum
+++ b/go.sum
@@ -26,12 +26,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e h1:T5PdfK/M1xyrHwynxMIVMWLS7f/qHwfslZphxtGnw7s=
 github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=
-gitlab.dms3.io/dms3/public/go-dms3-files v0.0.1 h1:q/ygphIIE5jY55tEWRi4jFFYnQqncEPHA/0yDMfxNGg=
-gitlab.dms3.io/dms3/public/go-dms3-files v0.0.1/go.mod h1:6HW2p8o4qGXvZ/TX4A/HzabOPfw3PsxiJbhFxQpqZBM=
-gitlab.dms3.io/dms3/public/go-log v0.0.1 h1:jqz2g8pVdPW+Sy8CCo4rYfGEjktGhCBfgIb3oeY6yx8=
-gitlab.dms3.io/dms3/public/go-log v0.0.1/go.mod h1:OsyF7lVYe47r03v1ZCbrmz0byeGUWB0Y219jN1DJx3s=
+gitlab.dms3.io/dms3/go-dms3-files v0.0.2 h1:M1MrOweEeocg8fyDbndzNLN3NeTiRyWRtIv9F824qQ4=
+gitlab.dms3.io/dms3/go-dms3-files v0.0.2/go.mod h1:dOpf6TLZxmWLy5kfMniycGJkWIPTgCcoeaaTNZ9+0To=
+gitlab.dms3.io/dms3/go-log v0.0.2 h1:vuNG5qmx6P9iK+A1+k4AmC6Q+ORm2ekWaQVbMmeL2wc=
+gitlab.dms3.io/dms3/go-log v0.0.2/go.mod h1:iLuW2zqJJaP1WdbME4P6AS9AIMovwGDAn3zV/riR5iE=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
@@ -75,5 +77,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
diff --git a/http/client.go b/http/client.go
index 7b62db37ca11996127dc87393da72fc701406e03..66410028734e36a6933bc40e39fc02450388d029 100644
--- a/http/client.go
+++ b/http/client.go
@@ -9,8 +9,8 @@ import (
 	"net/url"
 	"strings"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
 )
 
 const (
diff --git a/http/client_test.go b/http/client_test.go
index 86f07a6e2f994716a5cf686e428c7c869ea1748c..aacdf65e58c3653e74b790d7e5db847d98fb5533 100644
--- a/http/client_test.go
+++ b/http/client_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 func TestClientUserAgent(t *testing.T) {
diff --git a/http/config.go b/http/config.go
index 644a33b12b26a33414c7a133e923d0333a25360a..3c4c4d7d9a5c64ccf2a60080257de9bb67e4487a 100644
--- a/http/config.go
+++ b/http/config.go
@@ -114,7 +114,7 @@ func allowOrigin(r *http.Request, cfg *ServerConfig) bool {
 // the API would be vulnerable to. We check that the Referer
 // is allowed by CORS Origin (origins and referrers here will
 // work similarly in the normal uses of the API).
-// See discussion at https://gitlab.dms3.io/dms3/public/go-dms3/issues/1532
+// See discussion at https://gitlab.dms3.io/dms3/go-dms3/issues/1532
 func allowReferer(r *http.Request, cfg *ServerConfig) bool {
 	referer := r.Referer()
 
diff --git a/http/errors_test.go b/http/errors_test.go
index 1f0e7356c30fdbe816d9f9ec04441c24f54296c8..5c53a29edb3970f03be64cf2fa13f05cc37b0e75 100644
--- a/http/errors_test.go
+++ b/http/errors_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 func TestErrors(t *testing.T) {
diff --git a/http/flushfwd.go b/http/flushfwd.go
index 6f9984977072b2f5e47e681a460616e799de5786..0d73bd9c117f604ee5b05d535917e85ccc438fd1 100644
--- a/http/flushfwd.go
+++ b/http/flushfwd.go
@@ -3,7 +3,7 @@ package http
 import (
 	"net/http"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 type flushfwder struct {
diff --git a/http/handler.go b/http/handler.go
index 068890480929f58ef06940ebc216c263c7d7cac0..054f7ece77b5de5fe7bf02633948f8459bd246aa 100644
--- a/http/handler.go
+++ b/http/handler.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	cors "github.com/rs/cors"
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	logging "gitlab.dms3.io/dms3/go-log"
 )
 
 var log = logging.Logger("cmds/http")
@@ -132,7 +132,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// If we have a request body, make sure the preamble
 	// knows that it should close the body if it wants to
 	// write before completing reading.
-	// FIXME: https://gitlab.dms3.io/dms3/public/go-dms3/issues/5168
+	// FIXME: https://gitlab.dms3.io/dms3/go-dms3/issues/5168
 	// FIXME: https://github.com/golang/go/issues/15527
 	var bodyEOFChan chan struct{}
 	if r.Body != http.NoBody {
diff --git a/http/handler_test.go b/http/handler_test.go
index c2ab3a75b24115e1b374e0f5a59954a9b5d6800d..d8467bdae81e283b2a3880e07709a23e68493fa7 100644
--- a/http/handler_test.go
+++ b/http/handler_test.go
@@ -11,8 +11,8 @@ import (
 
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
 )
 
 type VersionOutput struct {
diff --git a/http/http_test.go b/http/http_test.go
index d10f7e8c73195f8b60359e50b9751f5695d9e9bd..636ef301033f55c1799ebb88ce9ed12b93249463 100644
--- a/http/http_test.go
+++ b/http/http_test.go
@@ -12,9 +12,9 @@ import (
 	"strings"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
 )
 
 func newReaderPathFile(t *testing.T, path string, reader io.ReadCloser, stat os.FileInfo) files.File {
diff --git a/http/parse.go b/http/parse.go
index c0f261753f27d9ec924bd7ee1b14c9020825b618..b8c7dbe430afaaf8986cb641da9f672ee3718eeb 100644
--- a/http/parse.go
+++ b/http/parse.go
@@ -10,10 +10,10 @@ import (
 	"strconv"
 	"strings"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
+	logging "gitlab.dms3.io/dms3/go-log"
 )
 
 // parseRequest parses the data in a http.Request and returns a command Request object
diff --git a/http/parse_test.go b/http/parse_test.go
index 27e9eee37534828068f456d16cd7db9da58ce0e6..eb11681a9528d870dc54b6d54e4e835aa9dd9d0e 100644
--- a/http/parse_test.go
+++ b/http/parse_test.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 func TestParse(t *testing.T) {
diff --git a/http/reforigin_test.go b/http/reforigin_test.go
index 31476949a056245e52ad38a5f09ed6c8ecb1849d..2f74ae8bd4ca65608f3d02abfdf97d9c187ff935 100644
--- a/http/reforigin_test.go
+++ b/http/reforigin_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 func assertHeaders(t *testing.T, resHeaders http.Header, reqHeaders map[string]string) {
diff --git a/http/response.go b/http/response.go
index ec9b86d369223d7b4108157bacbe9b8241f40a52..0bb48b1ae3984f297de4680c75fa3225cc988a22 100644
--- a/http/response.go
+++ b/http/response.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"strings"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 var (
diff --git a/http/response_test.go b/http/response_test.go
index 48e0cdd8cf95ef2bb0d267176024d3caaf931424..66e0eddec19500d502a6c193529ffe07e9b820e6 100644
--- a/http/response_test.go
+++ b/http/response_test.go
@@ -3,7 +3,7 @@ package http
 import (
 	"testing"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 type testResponseType struct {
diff --git a/http/responseemitter.go b/http/responseemitter.go
index d45c70f7c9c35493367d5eb4fb3f114df359e8c4..3c6e9e4d9c55b95e44402a908039d1237f091a36 100644
--- a/http/responseemitter.go
+++ b/http/responseemitter.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"sync"
 
-	cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds"
+	cmds "gitlab.dms3.io/dms3/go-dms3-cmds"
 )
 
 var (
@@ -269,7 +269,7 @@ func (re *responseEmitter) doPreamble(value interface{}) {
 
 	// If we have a request body, make sure we close the body
 	// if we want to write before completing reading.
-	// FIXME: https://gitlab.dms3.io/dms3/public/go-dms3/issues/5168
+	// FIXME: https://gitlab.dms3.io/dms3/go-dms3/issues/5168
 	// FIXME: https://github.com/golang/go/issues/15527
 	if re.bodyEOFChan != nil {
 		select {
diff --git a/request.go b/request.go
index 01bd954d2bda78bc900416eec9608e13525e1a19..2588b3bfdb81883136679ddd2a3919a977b8f79c 100644
--- a/request.go
+++ b/request.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	files "gitlab.dms3.io/dms3/public/go-dms3-files"
+	files "gitlab.dms3.io/dms3/go-dms3-files"
 )
 
 // Request represents a call to a command from a consumer