diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 47b8da124..9dcb9cbe7 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,3 +2,4 @@
 - [ ] This pull request is on the dev branch.
 - [ ] I used gofmt for formatting the code before submitting the pull request.
 -----
+    
\ No newline at end of file
diff --git a/README.md b/README.md
index 89f840762..cce7a20e5 100644
--- a/README.md
+++ b/README.md
@@ -19,5 +19,5 @@ We welcome pull requests from the community.
 To run the tests, execute the following command from within the root directory of the project:
 
 ```sh
-go test -v github.com/jfrog/jfrog-cli-core/tests -timeout 0
+go test -v github.com/jfrog/jfrog-cli-core/v2/tests -timeout 0
 ```
diff --git a/artifactory/commands/buildinfo/adddependencies.go b/artifactory/commands/buildinfo/adddependencies.go
index 300c15989..0d4410914 100644
--- a/artifactory/commands/buildinfo/adddependencies.go
+++ b/artifactory/commands/buildinfo/adddependencies.go
@@ -5,10 +5,10 @@ import (
 	regxp "regexp"
 	"strconv"
 
-	commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
diff --git a/artifactory/commands/buildinfo/addgit.go b/artifactory/commands/buildinfo/addgit.go
index 6742fa5a4..2db4d7fa4 100644
--- a/artifactory/commands/buildinfo/addgit.go
+++ b/artifactory/commands/buildinfo/addgit.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	utilsconfig "github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	utilsconfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
diff --git a/artifactory/commands/buildinfo/addgit_test.go b/artifactory/commands/buildinfo/addgit_test.go
index 0889a77d5..5f5d3e7e2 100644
--- a/artifactory/commands/buildinfo/addgit_test.go
+++ b/artifactory/commands/buildinfo/addgit_test.go
@@ -13,10 +13,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
-	"github.com/jfrog/jfrog-cli-core/utils/tests"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 )
 
diff --git a/artifactory/commands/buildinfo/buildappend.go b/artifactory/commands/buildinfo/buildappend.go
index 7d625029c..4a2e047b5 100644
--- a/artifactory/commands/buildinfo/buildappend.go
+++ b/artifactory/commands/buildinfo/buildappend.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
diff --git a/artifactory/commands/buildinfo/builddiscard.go b/artifactory/commands/buildinfo/builddiscard.go
index 7bd3b6fa2..5ebc919c0 100644
--- a/artifactory/commands/buildinfo/builddiscard.go
+++ b/artifactory/commands/buildinfo/builddiscard.go
@@ -1,8 +1,8 @@
 package buildinfo
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 )
 
diff --git a/artifactory/commands/buildinfo/clean.go b/artifactory/commands/buildinfo/clean.go
index ebc166e32..ba8a8f497 100644
--- a/artifactory/commands/buildinfo/clean.go
+++ b/artifactory/commands/buildinfo/clean.go
@@ -1,8 +1,8 @@
 package buildinfo
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
diff --git a/artifactory/commands/buildinfo/collectenv.go b/artifactory/commands/buildinfo/collectenv.go
index e4674fcf5..2112d5a9b 100644
--- a/artifactory/commands/buildinfo/collectenv.go
+++ b/artifactory/commands/buildinfo/collectenv.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/buildinfo/distribute.go b/artifactory/commands/buildinfo/distribute.go
index a53f47a14..b2ea798cd 100644
--- a/artifactory/commands/buildinfo/distribute.go
+++ b/artifactory/commands/buildinfo/distribute.go
@@ -1,8 +1,8 @@
 package buildinfo
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 )
 
diff --git a/artifactory/commands/buildinfo/promote.go b/artifactory/commands/buildinfo/promote.go
index 0d95520e4..42026df23 100644
--- a/artifactory/commands/buildinfo/promote.go
+++ b/artifactory/commands/buildinfo/promote.go
@@ -1,8 +1,8 @@
 package buildinfo
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 )
 
diff --git a/artifactory/commands/buildinfo/publish.go b/artifactory/commands/buildinfo/publish.go
index c7f22dfc6..9c8d64751 100644
--- a/artifactory/commands/buildinfo/publish.go
+++ b/artifactory/commands/buildinfo/publish.go
@@ -5,9 +5,9 @@ import (
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"sort"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
diff --git a/artifactory/commands/buildinfo/xrayscan.go b/artifactory/commands/buildinfo/xrayscan.go
index 213211638..85635e588 100644
--- a/artifactory/commands/buildinfo/xrayscan.go
+++ b/artifactory/commands/buildinfo/xrayscan.go
@@ -3,8 +3,8 @@ package buildinfo
 import (
 	"encoding/json"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/commands/container/buildcreate.go b/artifactory/commands/container/buildcreate.go
index 96bed0e32..eed5bad79 100644
--- a/artifactory/commands/container/buildcreate.go
+++ b/artifactory/commands/container/buildcreate.go
@@ -1,9 +1,9 @@
 package container
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type BuildDockerCreateCommand struct {
diff --git a/artifactory/commands/container/containermanager.go b/artifactory/commands/container/containermanager.go
index b2ecbf80f..5912f4c74 100644
--- a/artifactory/commands/container/containermanager.go
+++ b/artifactory/commands/container/containermanager.go
@@ -3,9 +3,9 @@ package container
 import (
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type ContainerManagerCommand struct {
diff --git a/artifactory/commands/container/promote.go b/artifactory/commands/container/promote.go
index 5977b7062..93b41fc12 100644
--- a/artifactory/commands/container/promote.go
+++ b/artifactory/commands/container/promote.go
@@ -1,8 +1,8 @@
 package container
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 )
 
diff --git a/artifactory/commands/container/pull.go b/artifactory/commands/container/pull.go
index 101b5fda8..140a8308b 100644
--- a/artifactory/commands/container/pull.go
+++ b/artifactory/commands/container/pull.go
@@ -1,9 +1,9 @@
 package container
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
 
diff --git a/artifactory/commands/container/push.go b/artifactory/commands/container/push.go
index db1bbd498..2560ba905 100644
--- a/artifactory/commands/container/push.go
+++ b/artifactory/commands/container/push.go
@@ -1,10 +1,10 @@
 package container
 
 import (
-	commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	servicesutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/commands/curl/curl.go b/artifactory/commands/curl/curl.go
index 448fca352..e1a32f66c 100644
--- a/artifactory/commands/curl/curl.go
+++ b/artifactory/commands/curl/curl.go
@@ -1,7 +1,7 @@
 package curl
 
 import (
-	"github.com/jfrog/jfrog-cli-core/common/commands"
+	"github.com/jfrog/jfrog-cli-core/v2/common/commands"
 )
 
 type RtCurlCommand struct {
diff --git a/artifactory/commands/distribution/createbundle.go b/artifactory/commands/distribution/createbundle.go
index 85986faba..65605921d 100644
--- a/artifactory/commands/distribution/createbundle.go
+++ b/artifactory/commands/distribution/createbundle.go
@@ -1,9 +1,9 @@
 package distribution
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/distribution/services"
 	distributionServicesUtils "github.com/jfrog/jfrog-client-go/distribution/services/utils"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
diff --git a/artifactory/commands/distribution/deletebundle.go b/artifactory/commands/distribution/deletebundle.go
index 5bab3005b..cbc048c6d 100644
--- a/artifactory/commands/distribution/deletebundle.go
+++ b/artifactory/commands/distribution/deletebundle.go
@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/distribution/services"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/commands/distribution/distributebundle.go b/artifactory/commands/distribution/distributebundle.go
index 1c11ef91c..ffc992dc2 100644
--- a/artifactory/commands/distribution/distributebundle.go
+++ b/artifactory/commands/distribution/distributebundle.go
@@ -1,9 +1,9 @@
 package distribution
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/distribution/services"
 )
 
diff --git a/artifactory/commands/distribution/signBundle.go b/artifactory/commands/distribution/signBundle.go
index d28eae0aa..feadf9908 100644
--- a/artifactory/commands/distribution/signBundle.go
+++ b/artifactory/commands/distribution/signBundle.go
@@ -1,8 +1,8 @@
 package distribution
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/distribution/services"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 )
diff --git a/artifactory/commands/distribution/updatebundle.go b/artifactory/commands/distribution/updatebundle.go
index baf47c054..682d91aed 100644
--- a/artifactory/commands/distribution/updatebundle.go
+++ b/artifactory/commands/distribution/updatebundle.go
@@ -1,9 +1,9 @@
 package distribution
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/distribution/services"
 	distributionServicesUtils "github.com/jfrog/jfrog-client-go/distribution/services/utils"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
diff --git a/artifactory/commands/dotnet/dotnetcommand.go b/artifactory/commands/dotnet/dotnetcommand.go
index 0185913bd..820b6a14e 100644
--- a/artifactory/commands/dotnet/dotnetcommand.go
+++ b/artifactory/commands/dotnet/dotnetcommand.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 
 	"github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/solution"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet/solution"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
diff --git a/artifactory/commands/dotnet/dotnetcommand_test.go b/artifactory/commands/dotnet/dotnetcommand_test.go
index 9ddd55896..606bafb9d 100644
--- a/artifactory/commands/dotnet/dotnetcommand_test.go
+++ b/artifactory/commands/dotnet/dotnetcommand_test.go
@@ -2,7 +2,7 @@ package dotnet
 
 import (
 	"github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"path/filepath"
diff --git a/artifactory/commands/dotnet/dotnetcorecli.go b/artifactory/commands/dotnet/dotnetcorecli.go
index 726006d17..b387c87f1 100644
--- a/artifactory/commands/dotnet/dotnetcorecli.go
+++ b/artifactory/commands/dotnet/dotnetcorecli.go
@@ -2,7 +2,7 @@ package dotnet
 
 import (
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/jfrog/jfrog-client-go/utils/version"
 )
diff --git a/artifactory/commands/dotnet/nuget.go b/artifactory/commands/dotnet/nuget.go
index 4444f6daf..e5b8f33e4 100644
--- a/artifactory/commands/dotnet/nuget.go
+++ b/artifactory/commands/dotnet/nuget.go
@@ -1,8 +1,8 @@
 package dotnet
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/solution"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet/solution"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/artifactory/commands/generic/copy.go b/artifactory/commands/generic/copy.go
index 5ad382561..564161e41 100644
--- a/artifactory/commands/generic/copy.go
+++ b/artifactory/commands/generic/copy.go
@@ -3,8 +3,8 @@ package generic
 import (
 	"errors"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/generic/createaccesstoken.go b/artifactory/commands/generic/createaccesstoken.go
index f9abbdd7a..e86e30589 100644
--- a/artifactory/commands/generic/createaccesstoken.go
+++ b/artifactory/commands/generic/createaccesstoken.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"strings"
 
-	rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
diff --git a/artifactory/commands/generic/delete.go b/artifactory/commands/generic/delete.go
index b0ecb5153..2c6f26f65 100644
--- a/artifactory/commands/generic/delete.go
+++ b/artifactory/commands/generic/delete.go
@@ -1,8 +1,8 @@
 package generic
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	clientutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/commands/generic/download.go b/artifactory/commands/generic/download.go
index a498655ed..e5202c689 100644
--- a/artifactory/commands/generic/download.go
+++ b/artifactory/commands/generic/download.go
@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	serviceutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
diff --git a/artifactory/commands/generic/generic.go b/artifactory/commands/generic/generic.go
index 7f078ac27..28bcde092 100644
--- a/artifactory/commands/generic/generic.go
+++ b/artifactory/commands/generic/generic.go
@@ -1,9 +1,9 @@
 package generic
 
 import (
-	commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type GenericCommand struct {
diff --git a/artifactory/commands/generic/gitlfsclean.go b/artifactory/commands/generic/gitlfsclean.go
index 13a52f5e7..1654d9558 100644
--- a/artifactory/commands/generic/gitlfsclean.go
+++ b/artifactory/commands/generic/gitlfsclean.go
@@ -3,8 +3,8 @@ package generic
 import (
 	"fmt"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	clientutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/commands/generic/move.go b/artifactory/commands/generic/move.go
index f27c927ba..f861584eb 100644
--- a/artifactory/commands/generic/move.go
+++ b/artifactory/commands/generic/move.go
@@ -3,8 +3,8 @@ package generic
 import (
 	"errors"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/generic/ping.go b/artifactory/commands/generic/ping.go
index de6b39e32..8136822f9 100644
--- a/artifactory/commands/generic/ping.go
+++ b/artifactory/commands/generic/ping.go
@@ -1,8 +1,8 @@
 package generic
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type PingCommand struct {
diff --git a/artifactory/commands/generic/ping_test.go b/artifactory/commands/generic/ping_test.go
index dd22ae083..4ece64bff 100644
--- a/artifactory/commands/generic/ping_test.go
+++ b/artifactory/commands/generic/ping_test.go
@@ -6,8 +6,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
 )
 
 func TestPingSuccess(t *testing.T) {
diff --git a/artifactory/commands/generic/props.go b/artifactory/commands/generic/props.go
index 6ad1e3aa1..96564174c 100644
--- a/artifactory/commands/generic/props.go
+++ b/artifactory/commands/generic/props.go
@@ -3,10 +3,10 @@ package generic
 import (
 	"errors"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	clientConfig "github.com/jfrog/jfrog-client-go/config"
diff --git a/artifactory/commands/generic/search.go b/artifactory/commands/generic/search.go
index 83b996c50..f77a90509 100644
--- a/artifactory/commands/generic/search.go
+++ b/artifactory/commands/generic/search.go
@@ -1,7 +1,7 @@
 package generic
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	clientartutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/content"
diff --git a/artifactory/commands/generic/upload.go b/artifactory/commands/generic/upload.go
index 266691aac..54c862c7e 100644
--- a/artifactory/commands/generic/upload.go
+++ b/artifactory/commands/generic/upload.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	rtServicesUtils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
diff --git a/artifactory/commands/golang/go.go b/artifactory/commands/golang/go.go
index bcfd557db..b9f510039 100644
--- a/artifactory/commands/golang/go.go
+++ b/artifactory/commands/golang/go.go
@@ -7,10 +7,10 @@ import (
 	"github.com/jfrog/gocmd/cmd"
 	executors "github.com/jfrog/gocmd/executers/utils"
 	"github.com/jfrog/gocmd/params"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/golang"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/golang/project"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/golang"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/golang/project"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
diff --git a/artifactory/commands/golang/gopublish.go b/artifactory/commands/golang/gopublish.go
index 69242a2bd..7e5739717 100644
--- a/artifactory/commands/golang/gopublish.go
+++ b/artifactory/commands/golang/gopublish.go
@@ -2,10 +2,10 @@ package golang
 
 import (
 	"errors"
-	commandutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/golang"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/golang/project"
+	commandutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/golang"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/golang/project"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/version"
 	"os/exec"
diff --git a/artifactory/commands/gradle/gradle.go b/artifactory/commands/gradle/gradle.go
index 72320afc5..9f71a1c70 100644
--- a/artifactory/commands/gradle/gradle.go
+++ b/artifactory/commands/gradle/gradle.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/generic"
-	commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic"
+	commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/artifactory/commands/gradle/gradle_test.go b/artifactory/commands/gradle/gradle_test.go
index aad60c0c9..2a16bb1e6 100644
--- a/artifactory/commands/gradle/gradle_test.go
+++ b/artifactory/commands/gradle/gradle_test.go
@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/artifactory/commands/mvn/mvn.go b/artifactory/commands/mvn/mvn.go
index 67ad0acac..d14560116 100644
--- a/artifactory/commands/mvn/mvn.go
+++ b/artifactory/commands/mvn/mvn.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/generic"
-	commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic"
+	commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/artifactory/commands/mvn/mvn_test.go b/artifactory/commands/mvn/mvn_test.go
index 6df932e47..03ee957ca 100644
--- a/artifactory/commands/mvn/mvn_test.go
+++ b/artifactory/commands/mvn/mvn_test.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/artifactory/commands/npm/installorci.go b/artifactory/commands/npm/installorci.go
index ac1c4d43b..e626ccbcf 100644
--- a/artifactory/commands/npm/installorci.go
+++ b/artifactory/commands/npm/installorci.go
@@ -10,16 +10,16 @@ import (
 	"strconv"
 	"strings"
 
-	commandUtils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
+	commandUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
 
 	gofrogcmd "github.com/jfrog/gofrog/io"
 	"github.com/jfrog/gofrog/parallel"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/npm"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/ioutils"
-	npmutils "github.com/jfrog/jfrog-cli-core/utils/npm"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/npm"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
+	npmutils "github.com/jfrog/jfrog-cli-core/v2/utils/npm"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/auth"
diff --git a/artifactory/commands/npm/installorci_test.go b/artifactory/commands/npm/installorci_test.go
index d99fc963a..8b6a525e8 100644
--- a/artifactory/commands/npm/installorci_test.go
+++ b/artifactory/commands/npm/installorci_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	npmutils "github.com/jfrog/jfrog-cli-core/utils/npm"
+	npmutils "github.com/jfrog/jfrog-cli-core/v2/utils/npm"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/artifactory/commands/npm/npmcommand.go b/artifactory/commands/npm/npmcommand.go
index 8de0886d1..17f6331f6 100644
--- a/artifactory/commands/npm/npmcommand.go
+++ b/artifactory/commands/npm/npmcommand.go
@@ -1,8 +1,8 @@
 package npm
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type NpmCommand struct {
diff --git a/artifactory/commands/npm/publish.go b/artifactory/commands/npm/publish.go
index 6b1dc5b45..5d0d7fb88 100644
--- a/artifactory/commands/npm/publish.go
+++ b/artifactory/commands/npm/publish.go
@@ -14,13 +14,13 @@ import (
 
 	"github.com/jfrog/jfrog-client-go/utils/io/content"
 
-	commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/npm"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/xray/commands/audit"
+	commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/npm"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/xray/commands/audit"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	specutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
diff --git a/artifactory/commands/permissiontarget/create.go b/artifactory/commands/permissiontarget/create.go
index a5f26b036..f34fd843b 100644
--- a/artifactory/commands/permissiontarget/create.go
+++ b/artifactory/commands/permissiontarget/create.go
@@ -1,7 +1,7 @@
 package permissiontarget
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type PermissionTargetCreateCommand struct {
diff --git a/artifactory/commands/permissiontarget/delete.go b/artifactory/commands/permissiontarget/delete.go
index 17f92d375..3c5bd1574 100644
--- a/artifactory/commands/permissiontarget/delete.go
+++ b/artifactory/commands/permissiontarget/delete.go
@@ -1,9 +1,9 @@
 package permissiontarget
 
 import (
-	rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 )
 
 type PermissionTargetDeleteCommand struct {
diff --git a/artifactory/commands/permissiontarget/permissiontarget.go b/artifactory/commands/permissiontarget/permissiontarget.go
index 412ad4d86..78fdfb778 100644
--- a/artifactory/commands/permissiontarget/permissiontarget.go
+++ b/artifactory/commands/permissiontarget/permissiontarget.go
@@ -3,9 +3,9 @@ package permissiontarget
 import (
 	"encoding/json"
 	"errors"
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"strings"
diff --git a/artifactory/commands/permissiontarget/template.go b/artifactory/commands/permissiontarget/template.go
index ea0c2c8c5..65d87afcc 100644
--- a/artifactory/commands/permissiontarget/template.go
+++ b/artifactory/commands/permissiontarget/template.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/c-bata/go-prompt"
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/permissiontarget/update.go b/artifactory/commands/permissiontarget/update.go
index fe84bb140..79ece5097 100644
--- a/artifactory/commands/permissiontarget/update.go
+++ b/artifactory/commands/permissiontarget/update.go
@@ -1,7 +1,7 @@
 package permissiontarget
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type PermissionTargetUpdateCommand struct {
diff --git a/artifactory/commands/pip/install.go b/artifactory/commands/pip/install.go
index f7b66ac3c..a25471c91 100644
--- a/artifactory/commands/pip/install.go
+++ b/artifactory/commands/pip/install.go
@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	piputils "github.com/jfrog/jfrog-cli-core/artifactory/utils/pip"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/pip/dependencies"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	piputils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/pip"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/pip/dependencies"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
diff --git a/artifactory/commands/pip/pip.go b/artifactory/commands/pip/pip.go
index 023c0b144..037eb7f86 100644
--- a/artifactory/commands/pip/pip.go
+++ b/artifactory/commands/pip/pip.go
@@ -1,7 +1,7 @@
 package pip
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type PipCommand struct {
diff --git a/artifactory/commands/replication/create.go b/artifactory/commands/replication/create.go
index 4d05d0c1d..578472f3d 100644
--- a/artifactory/commands/replication/create.go
+++ b/artifactory/commands/replication/create.go
@@ -5,10 +5,10 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
diff --git a/artifactory/commands/replication/delete.go b/artifactory/commands/replication/delete.go
index 805260e81..c4ad2d290 100644
--- a/artifactory/commands/replication/delete.go
+++ b/artifactory/commands/replication/delete.go
@@ -1,9 +1,9 @@
 package replication
 
 import (
-	rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 )
 
 type ReplicationDeleteCommand struct {
diff --git a/artifactory/commands/replication/template.go b/artifactory/commands/replication/template.go
index 156c65a59..e86d95b8e 100644
--- a/artifactory/commands/replication/template.go
+++ b/artifactory/commands/replication/template.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 
 	"github.com/c-bata/go-prompt"
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/repository/create.go b/artifactory/commands/repository/create.go
index 01755bf93..c5647bd88 100644
--- a/artifactory/commands/repository/create.go
+++ b/artifactory/commands/repository/create.go
@@ -1,7 +1,7 @@
 package repository
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type RepoCreateCommand struct {
diff --git a/artifactory/commands/repository/delete.go b/artifactory/commands/repository/delete.go
index f2d8b3465..52cc7c594 100644
--- a/artifactory/commands/repository/delete.go
+++ b/artifactory/commands/repository/delete.go
@@ -4,9 +4,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 )
 
diff --git a/artifactory/commands/repository/repository.go b/artifactory/commands/repository/repository.go
index f00f612da..617f1ed4c 100644
--- a/artifactory/commands/repository/repository.go
+++ b/artifactory/commands/repository/repository.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/commands/repository/template.go b/artifactory/commands/repository/template.go
index 210b09269..430e574f4 100644
--- a/artifactory/commands/repository/template.go
+++ b/artifactory/commands/repository/template.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/c-bata/go-prompt"
-	"github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/repository/update.go b/artifactory/commands/repository/update.go
index 104451a00..13aba85a7 100644
--- a/artifactory/commands/repository/update.go
+++ b/artifactory/commands/repository/update.go
@@ -1,7 +1,7 @@
 package repository
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type RepoUpdateCommand struct {
diff --git a/artifactory/commands/usersmanagement/groupcreate.go b/artifactory/commands/usersmanagement/groupcreate.go
index 28cdd4d28..93f404230 100644
--- a/artifactory/commands/usersmanagement/groupcreate.go
+++ b/artifactory/commands/usersmanagement/groupcreate.go
@@ -1,8 +1,8 @@
 package usersmanagement
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 )
 
diff --git a/artifactory/commands/usersmanagement/groupdelete.go b/artifactory/commands/usersmanagement/groupdelete.go
index b9b698f54..83e75f368 100644
--- a/artifactory/commands/usersmanagement/groupdelete.go
+++ b/artifactory/commands/usersmanagement/groupdelete.go
@@ -1,8 +1,8 @@
 package usersmanagement
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 type GroupDeleteCommand struct {
diff --git a/artifactory/commands/usersmanagement/groupupdate.go b/artifactory/commands/usersmanagement/groupupdate.go
index bfff9af4d..81abda91b 100644
--- a/artifactory/commands/usersmanagement/groupupdate.go
+++ b/artifactory/commands/usersmanagement/groupupdate.go
@@ -1,8 +1,8 @@
 package usersmanagement
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 )
 
diff --git a/artifactory/commands/usersmanagement/userscreate.go b/artifactory/commands/usersmanagement/userscreate.go
index a62a98b35..82e5a16dc 100644
--- a/artifactory/commands/usersmanagement/userscreate.go
+++ b/artifactory/commands/usersmanagement/userscreate.go
@@ -3,8 +3,8 @@ package usersmanagement
 import (
 	"fmt"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/usersmanagement/usersdelete.go b/artifactory/commands/usersmanagement/usersdelete.go
index ccbb035ac..2e7f60f52 100644
--- a/artifactory/commands/usersmanagement/usersdelete.go
+++ b/artifactory/commands/usersmanagement/usersdelete.go
@@ -3,8 +3,8 @@ package usersmanagement
 import (
 	"fmt"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
diff --git a/artifactory/commands/utils/conditionaluploadutils.go b/artifactory/commands/utils/conditionaluploadutils.go
index 647cae7a3..b4996b835 100644
--- a/artifactory/commands/utils/conditionaluploadutils.go
+++ b/artifactory/commands/utils/conditionaluploadutils.go
@@ -3,9 +3,9 @@ package utils
 import (
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/xray/commands/audit"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/xray/commands/audit"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/commands/utils/configfile.go b/artifactory/commands/utils/configfile.go
index b863396a4..19c8f52d4 100644
--- a/artifactory/commands/utils/configfile.go
+++ b/artifactory/commands/utils/configfile.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/codegangsta/cli"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/artifactory/commands/utils/configfile_test.go b/artifactory/commands/utils/configfile_test.go
index 6119e4bd9..e8b2f8b19 100644
--- a/artifactory/commands/utils/configfile_test.go
+++ b/artifactory/commands/utils/configfile_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/codegangsta/cli"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	clientlog "github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/spf13/viper"
diff --git a/artifactory/commands/utils/npmcmdutils.go b/artifactory/commands/utils/npmcmdutils.go
index c1f27dfd2..ed017e4ef 100644
--- a/artifactory/commands/utils/npmcmdutils.go
+++ b/artifactory/commands/utils/npmcmdutils.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
diff --git a/artifactory/commands/utils/questionnaire.go b/artifactory/commands/utils/questionnaire.go
index fa9d4db81..f5e882288 100644
--- a/artifactory/commands/utils/questionnaire.go
+++ b/artifactory/commands/utils/questionnaire.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/c-bata/go-prompt"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 )
 
 const (
diff --git a/artifactory/commands/utils/templateutils.go b/artifactory/commands/utils/templateutils.go
index f8b82e30f..ed1f72f7d 100644
--- a/artifactory/commands/utils/templateutils.go
+++ b/artifactory/commands/utils/templateutils.go
@@ -3,7 +3,7 @@ package utils
 import (
 	"encoding/json"
 	"errors"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"os"
 	"strings"
diff --git a/artifactory/commands/yarn/yarn.go b/artifactory/commands/yarn/yarn.go
index a8bcbf6b8..a3771daff 100644
--- a/artifactory/commands/yarn/yarn.go
+++ b/artifactory/commands/yarn/yarn.go
@@ -11,12 +11,12 @@ import (
 	"strings"
 
 	"github.com/jfrog/gofrog/parallel"
-	commandUtils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/yarn"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/ioutils"
+	commandUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/yarn"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/auth"
diff --git a/artifactory/utils/argsutils.go b/artifactory/utils/argsutils.go
index 2aace18ce..a2ca7a1ee 100644
--- a/artifactory/utils/argsutils.go
+++ b/artifactory/utils/argsutils.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 )
 
 func ExtractBuildDetailsFromArgs(args []string) (cleanArgs []string, buildConfig *BuildConfiguration, err error) {
diff --git a/artifactory/utils/argsutils_test.go b/artifactory/utils/argsutils_test.go
index 15905de08..2061681c0 100644
--- a/artifactory/utils/argsutils_test.go
+++ b/artifactory/utils/argsutils_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 )
 
 func TestExtractBuildDetailsFromArgs(t *testing.T) {
diff --git a/artifactory/utils/buildinfoproperties.go b/artifactory/utils/buildinfoproperties.go
index 372849691..264f754db 100644
--- a/artifactory/utils/buildinfoproperties.go
+++ b/artifactory/utils/buildinfoproperties.go
@@ -10,10 +10,10 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/jfrog/jfrog-cli-core/utils/ioutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 
 	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/utils/buildinfoproperties_test.go b/artifactory/utils/buildinfoproperties_test.go
index 8811e3e27..346be69fd 100644
--- a/artifactory/utils/buildinfoproperties_test.go
+++ b/artifactory/utils/buildinfoproperties_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/spf13/viper"
 )
diff --git a/artifactory/utils/buildutils.go b/artifactory/utils/buildutils.go
index 042dec499..efe4d3520 100644
--- a/artifactory/utils/buildutils.go
+++ b/artifactory/utils/buildutils.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/utils/container/buildinfo.go b/artifactory/utils/container/buildinfo.go
index eb8745790..45c050905 100644
--- a/artifactory/utils/container/buildinfo.go
+++ b/artifactory/utils/container/buildinfo.go
@@ -8,7 +8,7 @@ import (
 	"path"
 	"strings"
 
-	artutils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
+	artutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
diff --git a/artifactory/utils/container/containermanager.go b/artifactory/utils/container/containermanager.go
index 9b87ac052..450f367cd 100644
--- a/artifactory/utils/container/containermanager.go
+++ b/artifactory/utils/container/containermanager.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/artifactory/utils/delete.go b/artifactory/utils/delete.go
index dc198a011..c9703d330 100644
--- a/artifactory/utils/delete.go
+++ b/artifactory/utils/delete.go
@@ -3,8 +3,8 @@ package utils
 import (
 	"fmt"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	rtclientutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"github.com/jfrog/jfrog-client-go/utils/io/content"
diff --git a/artifactory/utils/dependenciesutils.go b/artifactory/utils/dependenciesutils.go
index 4f346d366..a58434d64 100644
--- a/artifactory/utils/dependenciesutils.go
+++ b/artifactory/utils/dependenciesutils.go
@@ -8,8 +8,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/http/jfroghttpclient"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/utils/dotnet/dependencies/dependencies.go b/artifactory/utils/dotnet/dependencies/dependencies.go
index b6c8a5eea..c9d8ae23f 100644
--- a/artifactory/utils/dotnet/dependencies/dependencies.go
+++ b/artifactory/utils/dotnet/dependencies/dependencies.go
@@ -2,7 +2,7 @@ package dependencies
 
 import (
 	"fmt"
-	deptree "github.com/jfrog/jfrog-cli-core/artifactory/utils/dependenciestree"
+	deptree "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dependenciestree"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/utils/dotnet/dependencies/packagesconfig.go b/artifactory/utils/dotnet/dependencies/packagesconfig.go
index 829bcc3be..ae85e320f 100644
--- a/artifactory/utils/dotnet/dependencies/packagesconfig.go
+++ b/artifactory/utils/dotnet/dependencies/packagesconfig.go
@@ -4,7 +4,7 @@ import (
 	"encoding/xml"
 	"fmt"
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
diff --git a/artifactory/utils/dotnet/dependencies/packagesconfig_test.go b/artifactory/utils/dotnet/dependencies/packagesconfig_test.go
index 6f3347d2e..6602c8703 100644
--- a/artifactory/utils/dotnet/dependencies/packagesconfig_test.go
+++ b/artifactory/utils/dotnet/dependencies/packagesconfig_test.go
@@ -2,7 +2,7 @@ package dependencies
 
 import (
 	"encoding/xml"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"path/filepath"
 	"reflect"
diff --git a/artifactory/utils/dotnet/solution/project/project.go b/artifactory/utils/dotnet/solution/project/project.go
index 53a95b60e..83de59666 100644
--- a/artifactory/utils/dotnet/solution/project/project.go
+++ b/artifactory/utils/dotnet/solution/project/project.go
@@ -2,8 +2,8 @@ package project
 
 import (
 	"encoding/json"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dependenciestree"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/dependencies"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dependenciestree"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet/dependencies"
 )
 
 type Project interface {
diff --git a/artifactory/utils/dotnet/solution/solution.go b/artifactory/utils/dotnet/solution/solution.go
index 07d0d37f6..344b62b3d 100644
--- a/artifactory/utils/dotnet/solution/solution.go
+++ b/artifactory/utils/dotnet/solution/solution.go
@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/dependencies"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/solution/project"
-	"github.com/jfrog/jfrog-cli-core/utils/ioutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet/dependencies"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet/solution/project"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/utils/dotnet/toolchaincmd.go b/artifactory/utils/dotnet/toolchaincmd.go
index da6e883d4..aadee2753 100644
--- a/artifactory/utils/dotnet/toolchaincmd.go
+++ b/artifactory/utils/dotnet/toolchaincmd.go
@@ -1,7 +1,7 @@
 package dotnet
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"io"
 	"os/exec"
diff --git a/artifactory/utils/download.go b/artifactory/utils/download.go
index 954b20e40..ba06623d6 100644
--- a/artifactory/utils/download.go
+++ b/artifactory/utils/download.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/utils/io"
 )
diff --git a/artifactory/utils/golang/project/archive_test.go b/artifactory/utils/golang/project/archive_test.go
index c86e4d570..076756d56 100644
--- a/artifactory/utils/golang/project/archive_test.go
+++ b/artifactory/utils/golang/project/archive_test.go
@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
-	"github.com/jfrog/jfrog-cli-core/utils/tests"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils/checksum"
 )
 
diff --git a/artifactory/utils/golang/project/project.go b/artifactory/utils/golang/project/project.go
index 0054ec57b..97e126a74 100644
--- a/artifactory/utils/golang/project/project.go
+++ b/artifactory/utils/golang/project/project.go
@@ -16,7 +16,7 @@ import (
 	"github.com/jfrog/gocmd/cmd"
 	gocmd "github.com/jfrog/gocmd/cmd"
 	"github.com/jfrog/gocmd/executers"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	_go "github.com/jfrog/jfrog-client-go/artifactory/services/go"
diff --git a/artifactory/utils/npm/list.go b/artifactory/utils/npm/list.go
index 19ec33b97..8701fd9d5 100644
--- a/artifactory/utils/npm/list.go
+++ b/artifactory/utils/npm/list.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	coreutils "github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	coreutils "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/artifactory/utils/pip/dependencies/dependencies.go b/artifactory/utils/pip/dependencies/dependencies.go
index 61913962d..936c69390 100644
--- a/artifactory/utils/pip/dependencies/dependencies.go
+++ b/artifactory/utils/pip/dependencies/dependencies.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	serviceutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
diff --git a/artifactory/utils/pip/installer.go b/artifactory/utils/pip/installer.go
index e9cab9953..25051cb90 100644
--- a/artifactory/utils/pip/installer.go
+++ b/artifactory/utils/pip/installer.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/auth"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/artifactory/utils/projectconfig.go b/artifactory/utils/projectconfig.go
index 2f1961faa..a7ba5137d 100644
--- a/artifactory/utils/projectconfig.go
+++ b/artifactory/utils/projectconfig.go
@@ -5,9 +5,9 @@ import (
 	"path/filepath"
 	"reflect"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/artifactory/utils/search.go b/artifactory/utils/search.go
index 70293713e..09a4b6600 100644
--- a/artifactory/utils/search.go
+++ b/artifactory/utils/search.go
@@ -3,7 +3,7 @@ package utils
 import (
 	"encoding/json"
 
-	"github.com/jfrog/jfrog-cli-core/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
diff --git a/artifactory/utils/search_test.go b/artifactory/utils/search_test.go
index d8b957321..cf3b8d676 100644
--- a/artifactory/utils/search_test.go
+++ b/artifactory/utils/search_test.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"bytes"
-	corelog "github.com/jfrog/jfrog-cli-core/utils/log"
+	corelog "github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	"os"
 	"path/filepath"
 	"testing"
diff --git a/artifactory/utils/upload.go b/artifactory/utils/upload.go
index 5574241f2..0fc206591 100644
--- a/artifactory/utils/upload.go
+++ b/artifactory/utils/upload.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/utils/io"
 )
diff --git a/artifactory/utils/utils.go b/artifactory/utils/utils.go
index b1a328bcb..c49516585 100644
--- a/artifactory/utils/utils.go
+++ b/artifactory/utils/utils.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/jfrog/jfrog-client-go/utils/io"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/auth"
 	clientConfig "github.com/jfrog/jfrog-client-go/config"
diff --git a/artifactory/utils/utils_test.go b/artifactory/utils/utils_test.go
index 13fe70987..ea7825b9a 100644
--- a/artifactory/utils/utils_test.go
+++ b/artifactory/utils/utils_test.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/stretchr/testify/assert"
 	"path/filepath"
 	"testing"
diff --git a/common/commands/command.go b/common/commands/command.go
index 785e1c32f..f9ffba0b5 100644
--- a/common/commands/command.go
+++ b/common/commands/command.go
@@ -1,9 +1,9 @@
 package commands
 
 import (
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/usage"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/common/commands/config.go b/common/commands/config.go
index 9e3f505aa..fda174463 100644
--- a/common/commands/config.go
+++ b/common/commands/config.go
@@ -10,14 +10,14 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/ioutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 
 	"github.com/jfrog/jfrog-client-go/auth"
 
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/lock"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/lock"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
diff --git a/common/commands/config_test.go b/common/commands/config_test.go
index f317e48a4..c3c06f3fc 100644
--- a/common/commands/config_test.go
+++ b/common/commands/config_test.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/common/commands/curl.go b/common/commands/curl.go
index 0bbc83f40..4da11c6d9 100644
--- a/common/commands/curl.go
+++ b/common/commands/curl.go
@@ -3,13 +3,13 @@ package commands
 import (
 	"errors"
 	"fmt"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"io"
 	"os/exec"
 	"strings"
 
 	gofrogcmd "github.com/jfrog/gofrog/io"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/common/spec/specfiles.go b/common/spec/specfiles.go
index f3aa39651..c57658e1d 100644
--- a/common/spec/specfiles.go
+++ b/common/spec/specfiles.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/general/cisetup/jenkinsfilegenerator.go b/general/cisetup/jenkinsfilegenerator.go
index 20ba87f9e..e95c579d9 100644
--- a/general/cisetup/jenkinsfilegenerator.go
+++ b/general/cisetup/jenkinsfilegenerator.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 )
 
 const JenkinsfileName = "Jenkinsfile"
diff --git a/general/cisetup/pipelinesconfig.go b/general/cisetup/pipelinesconfig.go
index b6da50d12..479faa04f 100644
--- a/general/cisetup/pipelinesconfig.go
+++ b/general/cisetup/pipelinesconfig.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/auth"
 	clientConfig "github.com/jfrog/jfrog-client-go/config"
diff --git a/general/cisetup/pipelinesyaml.go b/general/cisetup/pipelinesyaml.go
index 28d9ea7bd..6786179dc 100644
--- a/general/cisetup/pipelinesyaml.go
+++ b/general/cisetup/pipelinesyaml.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"gopkg.in/yaml.v2"
diff --git a/go.mod b/go.mod
index 8ce07a888..91822bd28 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/jfrog/jfrog-cli-core
+module github.com/jfrog/jfrog-cli-core/v2
 
 go 1.14
 
diff --git a/missioncontrol/commands/jpdadd.go b/missioncontrol/commands/jpdadd.go
index cd0cbee43..dff6360f4 100644
--- a/missioncontrol/commands/jpdadd.go
+++ b/missioncontrol/commands/jpdadd.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/jfrog/jfrog-cli-core/missioncontrol/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/missioncontrol/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/missioncontrol/commands/jpddelete.go b/missioncontrol/commands/jpddelete.go
index 3be05f01e..5a074057e 100644
--- a/missioncontrol/commands/jpddelete.go
+++ b/missioncontrol/commands/jpddelete.go
@@ -3,8 +3,8 @@ package commands
 import (
 	"errors"
 
-	"github.com/jfrog/jfrog-cli-core/missioncontrol/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/missioncontrol/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/missioncontrol/commands/licenseacquire.go b/missioncontrol/commands/licenseacquire.go
index e52329bb6..2eecf5ac2 100644
--- a/missioncontrol/commands/licenseacquire.go
+++ b/missioncontrol/commands/licenseacquire.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/jfrog/jfrog-cli-core/missioncontrol/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/missioncontrol/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/missioncontrol/commands/licensedeploy.go b/missioncontrol/commands/licensedeploy.go
index acd8d7c18..0590432fa 100644
--- a/missioncontrol/commands/licensedeploy.go
+++ b/missioncontrol/commands/licensedeploy.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/jfrog/jfrog-cli-core/missioncontrol/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/missioncontrol/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/missioncontrol/commands/licenserelease.go b/missioncontrol/commands/licenserelease.go
index 2ad8fb809..84f241115 100644
--- a/missioncontrol/commands/licenserelease.go
+++ b/missioncontrol/commands/licenserelease.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/jfrog/jfrog-cli-core/missioncontrol/utils"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/missioncontrol/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/missioncontrol/utils/missioncontrolutils.go b/missioncontrol/utils/missioncontrolutils.go
index e8549f558..13fe1af58 100644
--- a/missioncontrol/utils/missioncontrolutils.go
+++ b/missioncontrol/utils/missioncontrolutils.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"encoding/json"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/io/httputils"
 )
 
diff --git a/plugins/commonutils.go b/plugins/commonutils.go
index 2a83d2424..29cb519b9 100644
--- a/plugins/commonutils.go
+++ b/plugins/commonutils.go
@@ -3,9 +3,9 @@ package plugins
 import (
 	"errors"
 
-	"github.com/jfrog/jfrog-cli-core/common/commands"
-	"github.com/jfrog/jfrog-cli-core/plugins/components"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/common/commands"
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils"
 )
 
diff --git a/plugins/components/conversionlayer.go b/plugins/components/conversionlayer.go
index 870908149..77b452795 100644
--- a/plugins/components/conversionlayer.go
+++ b/plugins/components/conversionlayer.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/codegangsta/cli"
-	"github.com/jfrog/jfrog-cli-core/docs/common"
+	"github.com/jfrog/jfrog-cli-core/v2/docs/common"
 	"strings"
 )
 
diff --git a/plugins/pluginmain.go b/plugins/pluginmain.go
index 362466c99..5dd12270d 100644
--- a/plugins/pluginmain.go
+++ b/plugins/pluginmain.go
@@ -2,10 +2,10 @@ package plugins
 
 import (
 	"github.com/codegangsta/cli"
-	jfrogclicore "github.com/jfrog/jfrog-cli-core"
-	"github.com/jfrog/jfrog-cli-core/plugins/components"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
+	jfrogclicore "github.com/jfrog/jfrog-cli-core/v2"
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	"github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	clientLog "github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/plugins/signature.go b/plugins/signature.go
index 58d721051..3cd0152f7 100644
--- a/plugins/signature.go
+++ b/plugins/signature.go
@@ -3,7 +3,7 @@ package plugins
 import (
 	"encoding/json"
 	"github.com/codegangsta/cli"
-	"github.com/jfrog/jfrog-cli-core/plugins/components"
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
diff --git a/tests/jfrogclicore_test.go b/tests/jfrogclicore_test.go
index db98b5075..ccb001b67 100644
--- a/tests/jfrogclicore_test.go
+++ b/tests/jfrogclicore_test.go
@@ -4,17 +4,17 @@ import (
 	"os"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	clientLog "github.com/jfrog/jfrog-client-go/utils/log"
 
-	"github.com/jfrog/jfrog-cli-core/utils/tests"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 
 	clientTests "github.com/jfrog/jfrog-client-go/utils/tests"
 )
 
 const (
-	CoreIntegrationTests = "github.com/jfrog/jfrog-cli-core/tests"
+	CoreIntegrationTests = "github.com/jfrog/jfrog-cli-core/v2/tests"
 )
 
 func init() {
diff --git a/utils/config/config.go b/utils/config/config.go
index 2c5ade9f0..1306d0616 100644
--- a/utils/config/config.go
+++ b/utils/config/config.go
@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/buger/jsonparser"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	cliLog "github.com/jfrog/jfrog-cli-core/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	cliLog "github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	artifactoryAuth "github.com/jfrog/jfrog-client-go/artifactory/auth"
 	"github.com/jfrog/jfrog-client-go/auth"
 	distributionAuth "github.com/jfrog/jfrog-client-go/distribution/auth"
diff --git a/utils/config/config_test.go b/utils/config/config_test.go
index f7de36ff2..c2cc23b6f 100644
--- a/utils/config/config_test.go
+++ b/utils/config/config_test.go
@@ -9,9 +9,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
-	"github.com/jfrog/jfrog-cli-core/utils/tests"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/utils/config/encryption.go b/utils/config/encryption.go
index 44197522f..c09e7d1b7 100644
--- a/utils/config/encryption.go
+++ b/utils/config/encryption.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/spf13/viper"
diff --git a/utils/config/tokenrefresh.go b/utils/config/tokenrefresh.go
index 39d2bd671..8d3145b22 100644
--- a/utils/config/tokenrefresh.go
+++ b/utils/config/tokenrefresh.go
@@ -4,8 +4,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/utils/lock"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/lock"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	"github.com/jfrog/jfrog-client-go/auth"
diff --git a/utils/ioutils/ioutils.go b/utils/ioutils/ioutils.go
index 79dfa29ce..f00924597 100644
--- a/utils/ioutils/ioutils.go
+++ b/utils/ioutils/ioutils.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"golang.org/x/crypto/ssh/terminal"
 )
diff --git a/utils/lock/lock.go b/utils/lock/lock.go
index faa9609a5..d507dd6b8 100644
--- a/utils/lock/lock.go
+++ b/utils/lock/lock.go
@@ -3,7 +3,7 @@ package lock
 import (
 	"errors"
 	"fmt"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/utils/lock/lock_test.go b/utils/lock/lock_test.go
index fa532cf7b..aa906a4f0 100644
--- a/utils/lock/lock_test.go
+++ b/utils/lock/lock_test.go
@@ -2,7 +2,7 @@ package lock
 
 import (
 	"fmt"
-	"github.com/jfrog/jfrog-cli-core/utils/log"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"math"
 	"os"
diff --git a/utils/log/log.go b/utils/log/log.go
index fcc9808e2..f76899978 100644
--- a/utils/log/log.go
+++ b/utils/log/log.go
@@ -1,7 +1,7 @@
 package log
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"os"
 )
diff --git a/utils/npm/utils.go b/utils/npm/utils.go
index 77756b562..57f5de4c1 100644
--- a/utils/npm/utils.go
+++ b/utils/npm/utils.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/buger/jsonparser"
-	"github.com/jfrog/jfrog-cli-core/artifactory/utils/npm"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/npm"
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
diff --git a/utils/tests/utils.go b/utils/tests/utils.go
index 71d8b7c02..f2993e99e 100644
--- a/utils/tests/utils.go
+++ b/utils/tests/utils.go
@@ -1,7 +1,7 @@
 package tests
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"os"
diff --git a/xray/commands/audit/npm.go b/xray/commands/audit/npm.go
index 10c943a7d..1140d93fa 100644
--- a/xray/commands/audit/npm.go
+++ b/xray/commands/audit/npm.go
@@ -3,11 +3,11 @@ package audit
 import (
 	"os"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	npmutils "github.com/jfrog/jfrog-cli-core/utils/npm"
-	"github.com/jfrog/jfrog-cli-core/xray/commands"
-	xrutils "github.com/jfrog/jfrog-cli-core/xray/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	npmutils "github.com/jfrog/jfrog-cli-core/v2/utils/npm"
+	"github.com/jfrog/jfrog-cli-core/v2/xray/commands"
+	xrutils "github.com/jfrog/jfrog-cli-core/v2/xray/utils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	"github.com/jfrog/jfrog-client-go/xray/services"
diff --git a/xray/commands/audit/scan.go b/xray/commands/audit/scan.go
index 198f44266..7a2453596 100644
--- a/xray/commands/audit/scan.go
+++ b/xray/commands/audit/scan.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/jfrog/gofrog/io"
 	"github.com/jfrog/gofrog/parallel"
-	"github.com/jfrog/jfrog-cli-core/common/spec"
-	"github.com/jfrog/jfrog-cli-core/utils/config"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
-	"github.com/jfrog/jfrog-cli-core/xray/commands"
-	xrutils "github.com/jfrog/jfrog-cli-core/xray/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/xray/commands"
+	xrutils "github.com/jfrog/jfrog-cli-core/v2/xray/utils"
 	"github.com/jfrog/jfrog-client-go/artifactory/services/fspatterns"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/xray/commands/curl/curl.go b/xray/commands/curl/curl.go
index bce37b4c1..54a047a24 100644
--- a/xray/commands/curl/curl.go
+++ b/xray/commands/curl/curl.go
@@ -1,7 +1,7 @@
 package curl
 
 import (
-	"github.com/jfrog/jfrog-cli-core/common/commands"
+	"github.com/jfrog/jfrog-cli-core/v2/common/commands"
 )
 
 type XrCurlCommand struct {
diff --git a/xray/commands/offlineupdate/offlineupdate.go b/xray/commands/offlineupdate/offlineupdate.go
index 4e60c3c9e..bdeef0760 100644
--- a/xray/commands/offlineupdate/offlineupdate.go
+++ b/xray/commands/offlineupdate/offlineupdate.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
diff --git a/xray/commands/utils.go b/xray/commands/utils.go
index be574c95e..676db0864 100644
--- a/xray/commands/utils.go
+++ b/xray/commands/utils.go
@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	clientconfig "github.com/jfrog/jfrog-client-go/config"
 	"github.com/jfrog/jfrog-client-go/xray"
 )
diff --git a/xray/utils/downloadindexer.go b/xray/utils/downloadindexer.go
index 52c320a79..5e80d4286 100644
--- a/xray/utils/downloadindexer.go
+++ b/xray/utils/downloadindexer.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/jfrog/jfrog-cli-core/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
diff --git a/xray/utils/resultstable.go b/xray/utils/resultstable.go
index 557fdd02a..bca82916f 100644
--- a/xray/utils/resultstable.go
+++ b/xray/utils/resultstable.go
@@ -3,7 +3,7 @@ package utils
 import (
 	"fmt"
 	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-client-go/xray/services"
 	"os"
 	"strings"