Repository: scaleway/scaleway-cli
Pull request #4093 (2024-08-30 09:42:51)

chore: export core package and transition GetCommands to its own package
### Community Note

* Please vote on this pull request by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original pull request comment to help the community and maintainers prioritize this request.
* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

<!--- Thank you for keeping this note for the community --->

<!--- If your PR fully resolves and should automatically close the linked issue, use Closes. Otherwise, use Relates --->
Relates OR Closes #0000

Release note for [CHANGELOG](https://github.com/scaleway/scaleway-cli/blob/master/CHANGELOG.md):
<!--
If the change is not user facing, just write "NONE" in the release-note block below.
-->

```release-note

```


codecov-commenter: ## [Codecov](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway) Report
Attention: Patch coverage is `0%` with `5 lines` in your changes missing coverage. Please review.
> Project coverage is 72.40%. Comparing base [(`5bf53e0`)](https://app.codecov.io/gh/scaleway/scaleway-cli/commit/5bf53e08f3fb10f86b490ff7e674c655f0235348?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway) to head [(`907f8d4`)](https://app.codecov.io/gh/scaleway/scaleway-cli/commit/907f8d446437bfaba68206f95e2517703b944272?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway).
> Report is 230 commits behind head on master.

| [Files with missing lines](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway) | Patch % | Lines |
|---|---|---|
| [cmd/scw-doc-gen/main.go](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?src=pr&el=tree&filepath=cmd%2Fscw-doc-gen%2Fmain.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway#diff-Y21kL3Njdy1kb2MtZ2VuL21haW4uZ28=) | 0.00% | [2 Missing :warning: ](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway) |
| [cmd/scw-qa/main.go](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?src=pr&el=tree&filepath=cmd%2Fscw-qa%2Fmain.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway#diff-Y21kL3Njdy1xYS9tYWluLmdv) | 0.00% | [2 Missing :warning: ](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway) |
| [cmd/scw/main.go](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?src=pr&el=tree&filepath=cmd%2Fscw%2Fmain.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway#diff-Y21kL3Njdy9tYWluLmdv) | 0.00% | [1 Missing :warning: ](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway) |

<details><summary>Additional details and impacted files</summary>


```diff
@@            Coverage Diff             @@
##           master    #4093      +/-   ##
==========================================
- Coverage   75.45%   72.40%   -3.06%     
==========================================
  Files         202      289      +87     
  Lines       44323    53767    +9444     
==========================================
+ Hits        33444    38930    +5486     
- Misses       9653    13240    +3587     
- Partials     1226     1597     +371     
```

</details>

[:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/scaleway/scaleway-cli/pull/4093?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway).   
:loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=scaleway).


Patch:
diff --git a/Dockerfile b/Dockerfile
index 39fdac1a..9435a7bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,8 @@ RUN go mod download
 
 COPY scripts/ scripts/
 COPY cmd/ cmd/
+COPY core/ core/
+COPY commands/ commands/
 COPY internal/ internal/
 COPY .git/ .git/
 
diff --git a/cmd/scw-doc-gen/main.go b/cmd/scw-doc-gen/main.go
index c2893d55..304490e6 100644
--- a/cmd/scw-doc-gen/main.go
+++ b/cmd/scw-doc-gen/main.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/scaleway/scaleway-cli/v2/commands"
 	"github.com/scaleway/scaleway-cli/v2/internal/docgen"
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
 )
 
 // This command is used to generate markdown documentation for each commands (custom or generated) of the CLI
 func main() {
-	commands := namespaces.GetCommands()
+	cmds := commands.GetCommands()
 
 	outDir := flag.String("outdir", "./docs/commands", "Directory where markdown will be created")
 	flag.Parse()
@@ -25,7 +25,7 @@ func main() {
 		panic(fmt.Errorf("outdir %s must be a valid directory", *outDir))
 	}
 
-	err = docgen.GenerateDocs(commands, *outDir)
+	err = docgen.GenerateDocs(cmds, *outDir)
 	if err != nil {
 		panic(err)
 	}
diff --git a/cmd/scw-qa/main.go b/cmd/scw-qa/main.go
index 27347f1d..403d0e81 100644
--- a/cmd/scw-qa/main.go
+++ b/cmd/scw-qa/main.go
@@ -6,15 +6,15 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
+	"github.com/scaleway/scaleway-cli/v2/commands"
 	"github.com/scaleway/scaleway-cli/v2/internal/qa"
 	"github.com/scaleway/scaleway-cli/v2/internal/tabwriter"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 )
 
 func main() {
-	commands := namespaces.GetCommands()
-	errors := qa.LintCommands(commands)
+	cmds := commands.GetCommands()
+	errors := qa.LintCommands(cmds)
 
 	fmt.Println(terminal.Style("Errors:", color.Bold))
 	for _, err := range errors {
diff --git a/cmd/scw-wasm/main.go b/cmd/scw-wasm/main.go
index fedfaf01..86bc57fb 100644
--- a/cmd/scw-wasm/main.go
+++ b/cmd/scw-wasm/main.go
@@ -8,7 +8,7 @@ import (
 	"syscall/js"
 
 	"github.com/hashicorp/go-version"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/jshelpers"
 	"github.com/scaleway/scaleway-cli/v2/internal/wasm"
 )
diff --git a/cmd/scw-wasm/run.go b/cmd/scw-wasm/run.go
index 050ca129..88bc39a6 100644
--- a/cmd/scw-wasm/run.go
+++ b/cmd/scw-wasm/run.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"syscall/js"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/jshelpers"
 	"github.com/scaleway/scaleway-cli/v2/internal/wasm"
 )
diff --git a/cmd/scw/main.go b/cmd/scw/main.go
index 26aaf4d4..812c1543 100644
--- a/cmd/scw/main.go
+++ b/cmd/scw/main.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/hashicorp/go-version"
 	"github.com/mattn/go-colorable"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
+	"github.com/scaleway/scaleway-cli/v2/commands"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/platform/terminal"
 	"github.com/scaleway/scaleway-cli/v2/internal/sentry"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -78,7 +78,7 @@ func mainNoExit() int {
 
 	exitCode, _, _ := core.Bootstrap(&core.BootstrapConfig{
 		Args:      os.Args,
-		Commands:  namespaces.GetCommands(),
+		Commands:  commands.GetCommands(),
 		BuildInfo: buildInfo,
 		Stdout:    colorable.NewColorableStdout(),
 		Stderr:    colorable.NewColorableStderr(),
diff --git a/internal/namespaces/get_commands.go b/commands/commands.go
similarity index 98%
rename from internal/namespaces/get_commands.go
rename to commands/commands.go
index 0b648189..6e8530e5 100644
--- a/internal/namespaces/get_commands.go
+++ b/commands/commands.go
@@ -1,9 +1,9 @@
-package namespaces
+package commands
 
 import (
 	"os"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	accountv3 "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v3"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/alias"
 	applesilicon "github.com/scaleway/scaleway-cli/v2/internal/namespaces/applesilicon/v1alpha1"
diff --git a/internal/core/view.go b/core/view.go
similarity index 100%
rename from internal/core/view.go
rename to core/view.go
diff --git a/internal/core/web.go b/core/web.go
similarity index 100%
rename from internal/core/web.go
rename to core/web.go
diff --git a/internal/docgen/docgen.go b/internal/docgen/docgen.go
index b1de1bfe..c223df45 100644
--- a/internal/docgen/docgen.go
+++ b/internal/docgen/docgen.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 type tplData struct {
diff --git a/internal/editor/doc.go b/internal/editor/doc.go
index bbcc517d..8fca8877 100644
--- a/internal/editor/doc.go
+++ b/internal/editor/doc.go
@@ -1,7 +1,7 @@
 package editor
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 var LongDescription = `This command starts your default editor to edit a marshaled version of your resource
diff --git a/internal/namespaces/account/v3/account_cli.go b/internal/namespaces/account/v3/account_cli.go
index 6b6bc480..1f1c0869 100644
--- a/internal/namespaces/account/v3/account_cli.go
+++ b/internal/namespaces/account/v3/account_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/account/v3"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/account/v3/custom.go b/internal/namespaces/account/v3/custom.go
index 183ebb09..74eac729 100644
--- a/internal/namespaces/account/v3/custom.go
+++ b/internal/namespaces/account/v3/custom.go
@@ -1,7 +1,7 @@
 package account
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/alias/alias.go b/internal/namespaces/alias/alias.go
index 6203b6e0..5df49f7b 100644
--- a/internal/namespaces/alias/alias.go
+++ b/internal/namespaces/alias/alias.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/pkg/shlex"
 )
 
diff --git a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go b/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go
index 49008635..dd19da9e 100644
--- a/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go
+++ b/internal/namespaces/applesilicon/v1alpha1/applesilicon_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/applesilicon/v1alpha1/custom.go b/internal/namespaces/applesilicon/v1alpha1/custom.go
index e3a0f514..f86aab89 100644
--- a/internal/namespaces/applesilicon/v1alpha1/custom.go
+++ b/internal/namespaces/applesilicon/v1alpha1/custom.go
@@ -1,7 +1,7 @@
 package applesilicon
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 )
diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server.go b/internal/namespaces/applesilicon/v1alpha1/custom_server.go
index 067fb6da..54d953a7 100644
--- a/internal/namespaces/applesilicon/v1alpha1/custom_server.go
+++ b/internal/namespaces/applesilicon/v1alpha1/custom_server.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go b/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go
index 649821d4..928a41a1 100644
--- a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go
+++ b/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go b/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go
index 4e5ea823..a8d60065 100644
--- a/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go
+++ b/internal/namespaces/applesilicon/v1alpha1/custom_server_types.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 )
diff --git a/internal/namespaces/autocomplete/autocomplete.go b/internal/namespaces/autocomplete/autocomplete.go
index 78a48458..b8c61a41 100644
--- a/internal/namespaces/autocomplete/autocomplete.go
+++ b/internal/namespaces/autocomplete/autocomplete.go
@@ -13,8 +13,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-sdk-go/logger"
 )
diff --git a/internal/namespaces/autocomplete/errors.go b/internal/namespaces/autocomplete/errors.go
index 369296ae..47a668e2 100644
--- a/internal/namespaces/autocomplete/errors.go
+++ b/internal/namespaces/autocomplete/errors.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func unsupportedShellError(shell string) *core.CliError {
diff --git a/internal/namespaces/baremetal/v1/baremetal_cli.go b/internal/namespaces/baremetal/v1/baremetal_cli.go
index ec527162..6a0c42af 100644
--- a/internal/namespaces/baremetal/v1/baremetal_cli.go
+++ b/internal/namespaces/baremetal/v1/baremetal_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/baremetal/v1/custom.go b/internal/namespaces/baremetal/v1/custom.go
index 1e0532f4..1b1e03a1 100644
--- a/internal/namespaces/baremetal/v1/custom.go
+++ b/internal/namespaces/baremetal/v1/custom.go
@@ -1,7 +1,7 @@
 package baremetal
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 )
diff --git a/internal/namespaces/baremetal/v1/custom_server.go b/internal/namespaces/baremetal/v1/custom_server.go
index 63b210d6..af48b184 100644
--- a/internal/namespaces/baremetal/v1/custom_server.go
+++ b/internal/namespaces/baremetal/v1/custom_server.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/logger"
diff --git a/internal/namespaces/baremetal/v1/custom_server_create.go b/internal/namespaces/baremetal/v1/custom_server_create.go
index 2a2e6521..fa4fb7e8 100644
--- a/internal/namespaces/baremetal/v1/custom_server_create.go
+++ b/internal/namespaces/baremetal/v1/custom_server_create.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/baremetal/v1/custom_server_fip.go b/internal/namespaces/baremetal/v1/custom_server_fip.go
index 44fc68bf..8685545c 100644
--- a/internal/namespaces/baremetal/v1/custom_server_fip.go
+++ b/internal/namespaces/baremetal/v1/custom_server_fip.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	flexibleip "github.com/scaleway/scaleway-cli/v2/internal/namespaces/flexibleip/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	fip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
diff --git a/internal/namespaces/baremetal/v1/custom_server_fip_prompt.go b/internal/namespaces/baremetal/v1/custom_server_fip_prompt.go
index b2354ee6..c9d348f0 100644
--- a/internal/namespaces/baremetal/v1/custom_server_fip_prompt.go
+++ b/internal/namespaces/baremetal/v1/custom_server_fip_prompt.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 )
diff --git a/internal/namespaces/baremetal/v1/custom_server_install.go b/internal/namespaces/baremetal/v1/custom_server_install.go
index ae8a57f1..8031be8f 100644
--- a/internal/namespaces/baremetal/v1/custom_server_install.go
+++ b/internal/namespaces/baremetal/v1/custom_server_install.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	baremetal "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/baremetal/v1/custome_server_delete.go b/internal/namespaces/baremetal/v1/custome_server_delete.go
index 0987bc19..6e1421e5 100644
--- a/internal/namespaces/baremetal/v1/custome_server_delete.go
+++ b/internal/namespaces/baremetal/v1/custome_server_delete.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/billing/v2beta1/billing_cli.go b/internal/namespaces/billing/v2beta1/billing_cli.go
index b90c24e8..c7ac333e 100644
--- a/internal/namespaces/billing/v2beta1/billing_cli.go
+++ b/internal/namespaces/billing/v2beta1/billing_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	billing "github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/billing/v2beta1/custom.go b/internal/namespaces/billing/v2beta1/custom.go
index c2b3a6f0..6043c0bf 100644
--- a/internal/namespaces/billing/v2beta1/custom.go
+++ b/internal/namespaces/billing/v2beta1/custom.go
@@ -2,7 +2,7 @@ package billing
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	billing "github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
 )
diff --git a/internal/namespaces/billing/v2beta1/custom_invoice_download.go b/internal/namespaces/billing/v2beta1/custom_invoice_download.go
index e785a8b4..c5be6a64 100644
--- a/internal/namespaces/billing/v2beta1/custom_invoice_download.go
+++ b/internal/namespaces/billing/v2beta1/custom_invoice_download.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 	billing "github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
diff --git a/internal/namespaces/billing/v2beta1/custom_invoice_export.go b/internal/namespaces/billing/v2beta1/custom_invoice_export.go
index a07f5cfe..60633841 100644
--- a/internal/namespaces/billing/v2beta1/custom_invoice_export.go
+++ b/internal/namespaces/billing/v2beta1/custom_invoice_export.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 	billing "github.com/scaleway/scaleway-sdk-go/api/billing/v2beta1"
diff --git a/internal/namespaces/block/v1alpha1/block_cli.go b/internal/namespaces/block/v1alpha1/block_cli.go
index d1dfcd3a..362d54f8 100644
--- a/internal/namespaces/block/v1alpha1/block_cli.go
+++ b/internal/namespaces/block/v1alpha1/block_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/block/v1alpha1/custom.go b/internal/namespaces/block/v1alpha1/custom.go
index fc2e673c..d86fa4bf 100644
--- a/internal/namespaces/block/v1alpha1/custom.go
+++ b/internal/namespaces/block/v1alpha1/custom.go
@@ -2,7 +2,7 @@ package block
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 )
diff --git a/internal/namespaces/cockpit/v1/cockpit_cli.go b/internal/namespaces/cockpit/v1/cockpit_cli.go
index ae185c86..ef4587c5 100644
--- a/internal/namespaces/cockpit/v1/cockpit_cli.go
+++ b/internal/namespaces/cockpit/v1/cockpit_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/cockpit/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/cockpit/v1/custom.go b/internal/namespaces/cockpit/v1/custom.go
index 6bb06b6c..41a64441 100644
--- a/internal/namespaces/cockpit/v1/custom.go
+++ b/internal/namespaces/cockpit/v1/custom.go
@@ -1,7 +1,7 @@
 package cockpit
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/cockpit/v1/custom_cockpit.go b/internal/namespaces/cockpit/v1/custom_cockpit.go
index 6d2df2dd..8d165c6e 100644
--- a/internal/namespaces/cockpit/v1/custom_cockpit.go
+++ b/internal/namespaces/cockpit/v1/custom_cockpit.go
@@ -1,7 +1,7 @@
 package cockpit
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func cockpitTokenGetBuilder(c *core.Command) *core.Command {
diff --git a/internal/namespaces/config/commands.go b/internal/namespaces/config/commands.go
index c6be3450..4aec7321 100644
--- a/internal/namespaces/config/commands.go
+++ b/internal/namespaces/config/commands.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/tabwriter"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
diff --git a/internal/namespaces/config/errors.go b/internal/namespaces/config/errors.go
index 1d9551d6..5fdd9751 100644
--- a/internal/namespaces/config/errors.go
+++ b/internal/namespaces/config/errors.go
@@ -7,7 +7,7 @@ package config
 import (
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func invalidProfileKeyError(fieldName string) *core.CliError {
diff --git a/internal/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go
index fd1b41c6..eda02be3 100644
--- a/internal/namespaces/container/v1beta1/container_cli.go
+++ b/internal/namespaces/container/v1beta1/container_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/container/v1beta1/custom.go b/internal/namespaces/container/v1beta1/custom.go
index 0c9a9505..0a308d0f 100644
--- a/internal/namespaces/container/v1beta1/custom.go
+++ b/internal/namespaces/container/v1beta1/custom.go
@@ -1,7 +1,7 @@
 package container
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 )
diff --git a/internal/namespaces/container/v1beta1/custom_container.go b/internal/namespaces/container/v1beta1/custom_container.go
index 939d0209..68964b09 100644
--- a/internal/namespaces/container/v1beta1/custom_container.go
+++ b/internal/namespaces/container/v1beta1/custom_container.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/container/v1beta1/custom_deploy.go b/internal/namespaces/container/v1beta1/custom_deploy.go
index 828443f4..08dcdfe3 100644
--- a/internal/namespaces/container/v1beta1/custom_deploy.go
+++ b/internal/namespaces/container/v1beta1/custom_deploy.go
@@ -23,7 +23,7 @@ import (
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1beta1/getorcreate"
 	"github.com/scaleway/scaleway-cli/v2/internal/tasks"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
diff --git a/internal/namespaces/container/v1beta1/custom_deploy_disabled.go b/internal/namespaces/container/v1beta1/custom_deploy_disabled.go
index 669e7908..d54c1b27 100644
--- a/internal/namespaces/container/v1beta1/custom_deploy_disabled.go
+++ b/internal/namespaces/container/v1beta1/custom_deploy_disabled.go
@@ -2,7 +2,7 @@
 
 package container
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func containerDeployCommand() *core.Command {
 	return nil
diff --git a/internal/namespaces/container/v1beta1/custom_namespace.go b/internal/namespaces/container/v1beta1/custom_namespace.go
index 43fa612b..e9652d4d 100644
--- a/internal/namespaces/container/v1beta1/custom_namespace.go
+++ b/internal/namespaces/container/v1beta1/custom_namespace.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/dedibox/v1/custom.go b/internal/namespaces/dedibox/v1/custom.go
index 001030ee..96830c2d 100644
--- a/internal/namespaces/dedibox/v1/custom.go
+++ b/internal/namespaces/dedibox/v1/custom.go
@@ -3,7 +3,7 @@ package dedibox
 import (
 	"context"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/dedibox/v1/dedibox_cli.go b/internal/namespaces/dedibox/v1/dedibox_cli.go
index 327c7c69..cda94498 100644
--- a/internal/namespaces/dedibox/v1/dedibox_cli.go
+++ b/internal/namespaces/dedibox/v1/dedibox_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/dedibox/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/documentdb/v1beta1/custom.go b/internal/namespaces/documentdb/v1beta1/custom.go
index 6feec601..8ed1b37a 100644
--- a/internal/namespaces/documentdb/v1beta1/custom.go
+++ b/internal/namespaces/documentdb/v1beta1/custom.go
@@ -2,7 +2,7 @@ package documentdb
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
 )
diff --git a/internal/namespaces/documentdb/v1beta1/custom_engine.go b/internal/namespaces/documentdb/v1beta1/custom_engine.go
index 4d0ba775..03869638 100644
--- a/internal/namespaces/documentdb/v1beta1/custom_engine.go
+++ b/internal/namespaces/documentdb/v1beta1/custom_engine.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
 )
 
diff --git a/internal/namespaces/documentdb/v1beta1/documentdb_cli.go b/internal/namespaces/documentdb/v1beta1/documentdb_cli.go
index 9aceb72f..5bde9249 100644
--- a/internal/namespaces/documentdb/v1beta1/documentdb_cli.go
+++ b/internal/namespaces/documentdb/v1beta1/documentdb_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	documentdb "github.com/scaleway/scaleway-sdk-go/api/documentdb/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/domain/v2beta1/custom.go b/internal/namespaces/domain/v2beta1/custom.go
index 7ca77f66..072db89f 100644
--- a/internal/namespaces/domain/v2beta1/custom.go
+++ b/internal/namespaces/domain/v2beta1/custom.go
@@ -1,7 +1,7 @@
 package domain
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 )
diff --git a/internal/namespaces/domain/v2beta1/custom_record_add.go b/internal/namespaces/domain/v2beta1/custom_record_add.go
index 2adfb3df..4129ae63 100644
--- a/internal/namespaces/domain/v2beta1/custom_record_add.go
+++ b/internal/namespaces/domain/v2beta1/custom_record_add.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 )
 
diff --git a/internal/namespaces/domain/v2beta1/custom_record_delete.go b/internal/namespaces/domain/v2beta1/custom_record_delete.go
index b647e42e..7ab6fbac 100644
--- a/internal/namespaces/domain/v2beta1/custom_record_delete.go
+++ b/internal/namespaces/domain/v2beta1/custom_record_delete.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 )
 
diff --git a/internal/namespaces/domain/v2beta1/custom_record_set.go b/internal/namespaces/domain/v2beta1/custom_record_set.go
index 4e3b7ab6..3df79c7e 100644
--- a/internal/namespaces/domain/v2beta1/custom_record_set.go
+++ b/internal/namespaces/domain/v2beta1/custom_record_set.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 )
 
diff --git a/internal/namespaces/domain/v2beta1/domain_cli.go b/internal/namespaces/domain/v2beta1/domain_cli.go
index f8abb220..2475ddbe 100644
--- a/internal/namespaces/domain/v2beta1/domain_cli.go
+++ b/internal/namespaces/domain/v2beta1/domain_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	domain "github.com/scaleway/scaleway-sdk-go/api/domain/v2beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/edge_services/v1alpha1/custom.go b/internal/namespaces/edge_services/v1alpha1/custom.go
index a8a5575e..b3fdfbaf 100644
--- a/internal/namespaces/edge_services/v1alpha1/custom.go
+++ b/internal/namespaces/edge_services/v1alpha1/custom.go
@@ -1,6 +1,6 @@
 package edge_services
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func GetCommands() *core.Commands {
 	cmds := GetGeneratedCommands()
diff --git a/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go b/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go
index cf750e6c..15277451 100644
--- a/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go
+++ b/internal/namespaces/edge_services/v1alpha1/edge_services_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	edge_services "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/feedback/custom.go b/internal/namespaces/feedback/custom.go
index d8917ed4..6e15bb4a 100644
--- a/internal/namespaces/feedback/custom.go
+++ b/internal/namespaces/feedback/custom.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/feedback/issue.go b/internal/namespaces/feedback/issue.go
index f3c5ee84..19a0d81d 100644
--- a/internal/namespaces/feedback/issue.go
+++ b/internal/namespaces/feedback/issue.go
@@ -10,7 +10,7 @@ import (
 	"os/exec"
 	"runtime"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 )
 
diff --git a/internal/namespaces/flexibleip/v1alpha1/custom.go b/internal/namespaces/flexibleip/v1alpha1/custom.go
index e6589518..9f899e55 100644
--- a/internal/namespaces/flexibleip/v1alpha1/custom.go
+++ b/internal/namespaces/flexibleip/v1alpha1/custom.go
@@ -1,7 +1,7 @@
 package flexibleip
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	fip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 )
diff --git a/internal/namespaces/flexibleip/v1alpha1/custom_ip.go b/internal/namespaces/flexibleip/v1alpha1/custom_ip.go
index 47b309db..f11eb6c3 100644
--- a/internal/namespaces/flexibleip/v1alpha1/custom_ip.go
+++ b/internal/namespaces/flexibleip/v1alpha1/custom_ip.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	flexibleip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go b/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go
index e7fc3e9d..c51be972 100644
--- a/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go
+++ b/internal/namespaces/flexibleip/v1alpha1/flexibleip_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	flexibleip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/function/v1beta1/custom.go b/internal/namespaces/function/v1beta1/custom.go
index bc501fd2..d083bcae 100644
--- a/internal/namespaces/function/v1beta1/custom.go
+++ b/internal/namespaces/function/v1beta1/custom.go
@@ -1,7 +1,7 @@
 package function
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 )
diff --git a/internal/namespaces/function/v1beta1/custom_deploy.go b/internal/namespaces/function/v1beta1/custom_deploy.go
index e816b758..7e1210a3 100644
--- a/internal/namespaces/function/v1beta1/custom_deploy.go
+++ b/internal/namespaces/function/v1beta1/custom_deploy.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/tasks"
 	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/function/v1beta1/custom_deploy_disabled.go b/internal/namespaces/function/v1beta1/custom_deploy_disabled.go
index 767d9c02..b5f5ae1d 100644
--- a/internal/namespaces/function/v1beta1/custom_deploy_disabled.go
+++ b/internal/namespaces/function/v1beta1/custom_deploy_disabled.go
@@ -2,7 +2,7 @@
 
 package function
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func functionDeploy() *core.Command {
 	return nil
diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go
index 1ea788a8..2ffe7a35 100644
--- a/internal/namespaces/function/v1beta1/function_cli.go
+++ b/internal/namespaces/function/v1beta1/function_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	function "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/help/custom.go b/internal/namespaces/help/custom.go
index 93dc4db6..a6560c7f 100644
--- a/internal/namespaces/help/custom.go
+++ b/internal/namespaces/help/custom.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/iam/v1alpha1/custom.go b/internal/namespaces/iam/v1alpha1/custom.go
index 1ed40091..5c38fa64 100644
--- a/internal/namespaces/iam/v1alpha1/custom.go
+++ b/internal/namespaces/iam/v1alpha1/custom.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
diff --git a/internal/namespaces/iam/v1alpha1/custom_policy.go b/internal/namespaces/iam/v1alpha1/custom_policy.go
index 012562ab..95751d0c 100644
--- a/internal/namespaces/iam/v1alpha1/custom_policy.go
+++ b/internal/namespaces/iam/v1alpha1/custom_policy.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/iam/v1alpha1/custom_rule.go b/internal/namespaces/iam/v1alpha1/custom_rule.go
index 40286ade..7dc168c1 100644
--- a/internal/namespaces/iam/v1alpha1/custom_rule.go
+++ b/internal/namespaces/iam/v1alpha1/custom_rule.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/iam/v1alpha1/error.go b/internal/namespaces/iam/v1alpha1/error.go
index 06276756..6b8851eb 100644
--- a/internal/namespaces/iam/v1alpha1/error.go
+++ b/internal/namespaces/iam/v1alpha1/error.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func installationCanceled(addKeyInstructions string) *core.CliError {
diff --git a/internal/namespaces/iam/v1alpha1/iam_cli.go b/internal/namespaces/iam/v1alpha1/iam_cli.go
index ad621962..90235b54 100644
--- a/internal/namespaces/iam/v1alpha1/iam_cli.go
+++ b/internal/namespaces/iam/v1alpha1/iam_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/inference/v1beta1/custom.go b/internal/namespaces/inference/v1beta1/custom.go
index ed97f859..f619042a 100644
--- a/internal/namespaces/inference/v1beta1/custom.go
+++ b/internal/namespaces/inference/v1beta1/custom.go
@@ -1,7 +1,7 @@
 package inference
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 )
diff --git a/internal/namespaces/inference/v1beta1/custom_deployment.go b/internal/namespaces/inference/v1beta1/custom_deployment.go
index ffc68d5c..b6405335 100644
--- a/internal/namespaces/inference/v1beta1/custom_deployment.go
+++ b/internal/namespaces/inference/v1beta1/custom_deployment.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/inference/v1beta1/custom_endpoint.go b/internal/namespaces/inference/v1beta1/custom_endpoint.go
index cf7b4ced..95c1414a 100644
--- a/internal/namespaces/inference/v1beta1/custom_endpoint.go
+++ b/internal/namespaces/inference/v1beta1/custom_endpoint.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 )
 
diff --git a/internal/namespaces/inference/v1beta1/inference_cli.go b/internal/namespaces/inference/v1beta1/inference_cli.go
index 763c656a..e1b516ad 100644
--- a/internal/namespaces/inference/v1beta1/inference_cli.go
+++ b/internal/namespaces/inference/v1beta1/inference_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	inference "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/info/custom.go b/internal/namespaces/info/custom.go
index adb21e8a..9debac93 100644
--- a/internal/namespaces/info/custom.go
+++ b/internal/namespaces/info/custom.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/init/init.go b/internal/namespaces/init/init.go
index aa909e6c..6a154cbc 100644
--- a/internal/namespaces/init/init.go
+++ b/internal/namespaces/init/init.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/autocomplete"
 	iamcommands "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
diff --git a/internal/namespaces/init/prompt.go b/internal/namespaces/init/prompt.go
index cf29cfc2..70435611 100644
--- a/internal/namespaces/init/prompt.go
+++ b/internal/namespaces/init/prompt.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 	"github.com/scaleway/scaleway-sdk-go/api/account/v3"
diff --git a/internal/namespaces/instance/v1/custom.go b/internal/namespaces/instance/v1/custom.go
index 2805c48a..0ba44dc2 100644
--- a/internal/namespaces/instance/v1/custom.go
+++ b/internal/namespaces/instance/v1/custom.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
diff --git a/internal/namespaces/instance/v1/custom_image.go b/internal/namespaces/instance/v1/custom_image.go
index 5ddd0b81..7d0eb210 100644
--- a/internal/namespaces/instance/v1/custom_image.go
+++ b/internal/namespaces/instance/v1/custom_image.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/instance/v1/custom_ip.go b/internal/namespaces/instance/v1/custom_ip.go
index 206c157a..d3c012c3 100644
--- a/internal/namespaces/instance/v1/custom_ip.go
+++ b/internal/namespaces/instance/v1/custom_ip.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/logger"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/instance/v1/custom_placement_group.go b/internal/namespaces/instance/v1/custom_placement_group.go
index 53dca8cf..9366ce23 100644
--- a/internal/namespaces/instance/v1/custom_placement_group.go
+++ b/internal/namespaces/instance/v1/custom_placement_group.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_privatenics.go b/internal/namespaces/instance/v1/custom_privatenics.go
index ade1535e..d1e0238b 100644
--- a/internal/namespaces/instance/v1/custom_privatenics.go
+++ b/internal/namespaces/instance/v1/custom_privatenics.go
@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
diff --git a/internal/namespaces/instance/v1/custom_security_group.go b/internal/namespaces/instance/v1/custom_security_group.go
index 1f439f6c..c0be1e6f 100644
--- a/internal/namespaces/instance/v1/custom_security_group.go
+++ b/internal/namespaces/instance/v1/custom_security_group.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/editor"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
diff --git a/internal/namespaces/instance/v1/custom_server.go b/internal/namespaces/instance/v1/custom_server.go
index a109c427..fb67c9ea 100644
--- a/internal/namespaces/instance/v1/custom_server.go
+++ b/internal/namespaces/instance/v1/custom_server.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
diff --git a/internal/namespaces/instance/v1/custom_server_action.go b/internal/namespaces/instance/v1/custom_server_action.go
index 8619fe41..c72a81b5 100644
--- a/internal/namespaces/instance/v1/custom_server_action.go
+++ b/internal/namespaces/instance/v1/custom_server_action.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/instance/v1/custom_server_console.go b/internal/namespaces/instance/v1/custom_server_console.go
index 98d505d9..e4cad7d7 100644
--- a/internal/namespaces/instance/v1/custom_server_console.go
+++ b/internal/namespaces/instance/v1/custom_server_console.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/gotty"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
diff --git a/internal/namespaces/instance/v1/custom_server_console_disabled.go b/internal/namespaces/instance/v1/custom_server_console_disabled.go
index c36a10cd..3921529a 100644
--- a/internal/namespaces/instance/v1/custom_server_console_disabled.go
+++ b/internal/namespaces/instance/v1/custom_server_console_disabled.go
@@ -2,7 +2,7 @@
 
 package instance
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func serverConsoleCommand() *core.Command {
 	return nil
diff --git a/internal/namespaces/instance/v1/custom_server_create.go b/internal/namespaces/instance/v1/custom_server_create.go
index 440715d2..9e2e3f73 100644
--- a/internal/namespaces/instance/v1/custom_server_create.go
+++ b/internal/namespaces/instance/v1/custom_server_create.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/dustin/go-humanize"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v2"
diff --git a/internal/namespaces/instance/v1/custom_server_create_builder.go b/internal/namespaces/instance/v1/custom_server_create_builder.go
index c545d282..4fe5be69 100644
--- a/internal/namespaces/instance/v1/custom_server_create_builder.go
+++ b/internal/namespaces/instance/v1/custom_server_create_builder.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v2"
diff --git a/internal/namespaces/instance/v1/custom_server_rdp.go b/internal/namespaces/instance/v1/custom_server_rdp.go
index daf1910e..709eb222 100644
--- a/internal/namespaces/instance/v1/custom_server_rdp.go
+++ b/internal/namespaces/instance/v1/custom_server_rdp.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
diff --git a/internal/namespaces/instance/v1/custom_server_ssh.go b/internal/namespaces/instance/v1/custom_server_ssh.go
index f3d6ba65..a668e1b2 100644
--- a/internal/namespaces/instance/v1/custom_server_ssh.go
+++ b/internal/namespaces/instance/v1/custom_server_ssh.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/instance/v1/custom_server_type.go b/internal/namespaces/instance/v1/custom_server_type.go
index 6e0108d2..ae4ed59e 100644
--- a/internal/namespaces/instance/v1/custom_server_type.go
+++ b/internal/namespaces/instance/v1/custom_server_type.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/instance/v1/custom_snapshot.go b/internal/namespaces/instance/v1/custom_snapshot.go
index 5386a1e8..1d747669 100644
--- a/internal/namespaces/instance/v1/custom_snapshot.go
+++ b/internal/namespaces/instance/v1/custom_snapshot.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/instance/v1/custom_ssh_config.go b/internal/namespaces/instance/v1/custom_ssh_config.go
index ae17ac93..4ece27a8 100644
--- a/internal/namespaces/instance/v1/custom_ssh_config.go
+++ b/internal/namespaces/instance/v1/custom_ssh_config.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/sshconfig"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
diff --git a/internal/namespaces/instance/v1/custom_ssh_key.go b/internal/namespaces/instance/v1/custom_ssh_key.go
index faced533..45f9b817 100644
--- a/internal/namespaces/instance/v1/custom_ssh_key.go
+++ b/internal/namespaces/instance/v1/custom_ssh_key.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/instance/v1/custom_user_data.go b/internal/namespaces/instance/v1/custom_user_data.go
index e65451e1..bb8ba22b 100644
--- a/internal/namespaces/instance/v1/custom_user_data.go
+++ b/internal/namespaces/instance/v1/custom_user_data.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/instance/v1/custom_volume.go b/internal/namespaces/instance/v1/custom_volume.go
index 2fc6bbad..689e139e 100644
--- a/internal/namespaces/instance/v1/custom_volume.go
+++ b/internal/namespaces/instance/v1/custom_volume.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/instance/v1/custom_volume_type.go b/internal/namespaces/instance/v1/custom_volume_type.go
index 4e4444e8..76e55e58 100644
--- a/internal/namespaces/instance/v1/custom_volume_type.go
+++ b/internal/namespaces/instance/v1/custom_volume_type.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sort"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_web.go b/internal/namespaces/instance/v1/custom_web.go
index b6ab1509..047f3964 100644
--- a/internal/namespaces/instance/v1/custom_web.go
+++ b/internal/namespaces/instance/v1/custom_web.go
@@ -1,6 +1,6 @@
 package instance
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func addWebUrls(cmds *core.Commands) {
 	const imageURL = "https://console.scaleway.com/instance/images"
diff --git a/internal/namespaces/instance/v1/helpers_types.go b/internal/namespaces/instance/v1/helpers_types.go
index 89712bb7..279111f2 100644
--- a/internal/namespaces/instance/v1/helpers_types.go
+++ b/internal/namespaces/instance/v1/helpers_types.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/instance/v1/instance_cli.go b/internal/namespaces/instance/v1/instance_cli.go
index f56af75b..dda3d5d6 100644
--- a/internal/namespaces/instance/v1/instance_cli.go
+++ b/internal/namespaces/instance/v1/instance_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/iot/v1/custom.go b/internal/namespaces/iot/v1/custom.go
index 944533c0..b7427777 100644
--- a/internal/namespaces/iot/v1/custom.go
+++ b/internal/namespaces/iot/v1/custom.go
@@ -1,7 +1,7 @@
 package iot
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/iot/v1"
 )
diff --git a/internal/namespaces/iot/v1/custom_hub.go b/internal/namespaces/iot/v1/custom_hub.go
index 47a45b98..b966ceea 100644
--- a/internal/namespaces/iot/v1/custom_hub.go
+++ b/internal/namespaces/iot/v1/custom_hub.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/iot/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/iot/v1/iot_cli.go b/internal/namespaces/iot/v1/iot_cli.go
index 1d80c53a..e51582d4 100644
--- a/internal/namespaces/iot/v1/iot_cli.go
+++ b/internal/namespaces/iot/v1/iot_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/iot/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/ipam/v1/custom.go b/internal/namespaces/ipam/v1/custom.go
index 3bd6b6b9..c0814cbf 100644
--- a/internal/namespaces/ipam/v1/custom.go
+++ b/internal/namespaces/ipam/v1/custom.go
@@ -1,6 +1,6 @@
 package ipam
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func GetCommands() *core.Commands {
 	cmds := GetGeneratedCommands()
diff --git a/internal/namespaces/ipam/v1/ipam_cli.go b/internal/namespaces/ipam/v1/ipam_cli.go
index 3931b244..9e6fff35 100644
--- a/internal/namespaces/ipam/v1/ipam_cli.go
+++ b/internal/namespaces/ipam/v1/ipam_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/ipam/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/ipfs/v1alpha1/custom.go b/internal/namespaces/ipfs/v1alpha1/custom.go
index e97818f2..6944cd06 100644
--- a/internal/namespaces/ipfs/v1alpha1/custom.go
+++ b/internal/namespaces/ipfs/v1alpha1/custom.go
@@ -1,7 +1,7 @@
 package ipfs
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 // GetCommands returns the list of commands for the 'ipfs' namespace.
diff --git a/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go b/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go
index a3834e93..ff2a0b10 100644
--- a/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go
+++ b/internal/namespaces/ipfs/v1alpha1/ipfs_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/ipfs/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	ipfs "github.com/scaleway/scaleway-sdk-go/api/ipfs/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/jobs/v1alpha1/custom.go b/internal/namespaces/jobs/v1alpha1/custom.go
index c69123b1..35bc49ac 100644
--- a/internal/namespaces/jobs/v1alpha1/custom.go
+++ b/internal/namespaces/jobs/v1alpha1/custom.go
@@ -2,7 +2,7 @@ package jobs
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	jobs "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1"
 )
diff --git a/internal/namespaces/jobs/v1alpha1/custom_job_definition.go b/internal/namespaces/jobs/v1alpha1/custom_job_definition.go
index b2b95b41..a944cd6d 100644
--- a/internal/namespaces/jobs/v1alpha1/custom_job_definition.go
+++ b/internal/namespaces/jobs/v1alpha1/custom_job_definition.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	jobs "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/jobs/v1alpha1/custom_job_run.go b/internal/namespaces/jobs/v1alpha1/custom_job_run.go
index ca86c6d1..6d833a56 100644
--- a/internal/namespaces/jobs/v1alpha1/custom_job_run.go
+++ b/internal/namespaces/jobs/v1alpha1/custom_job_run.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	jobs "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/jobs/v1alpha1/jobs_cli.go b/internal/namespaces/jobs/v1alpha1/jobs_cli.go
index dbcd98f1..784c98e7 100644
--- a/internal/namespaces/jobs/v1alpha1/jobs_cli.go
+++ b/internal/namespaces/jobs/v1alpha1/jobs_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	jobs "github.com/scaleway/scaleway-sdk-go/api/jobs/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/k8s/v1/custom.go b/internal/namespaces/k8s/v1/custom.go
index 2d5fa7d9..c6f5b1ce 100644
--- a/internal/namespaces/k8s/v1/custom.go
+++ b/internal/namespaces/k8s/v1/custom.go
@@ -1,7 +1,7 @@
 package k8s
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 )
diff --git a/internal/namespaces/k8s/v1/custom_cluster.go b/internal/namespaces/k8s/v1/custom_cluster.go
index 253b2960..8d45261d 100644
--- a/internal/namespaces/k8s/v1/custom_cluster.go
+++ b/internal/namespaces/k8s/v1/custom_cluster.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
diff --git a/internal/namespaces/k8s/v1/custom_execcredentials.go b/internal/namespaces/k8s/v1/custom_execcredentials.go
index 8bcc3df4..4a0422f0 100644
--- a/internal/namespaces/k8s/v1/custom_execcredentials.go
+++ b/internal/namespaces/k8s/v1/custom_execcredentials.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/scaleway-sdk-go/validation"
 )
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig.go b/internal/namespaces/k8s/v1/custom_kubeconfig.go
index 7cdf1aaa..19417ac5 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig.go
@@ -1,7 +1,7 @@
 package k8s
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func k8sKubeconfigCommand() *core.Command {
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_get.go b/internal/namespaces/k8s/v1/custom_kubeconfig_get.go
index 5df9064a..925f0bb1 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig_get.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig_get.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go b/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go
index 8b2cf9b7..e4aa5260 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig_helpers.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 )
 
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_install.go b/internal/namespaces/k8s/v1/custom_kubeconfig_install.go
index 7368396b..fc580140 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig_install.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig_install.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go b/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go
index 68ef4afb..9df0f627 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 )
 
diff --git a/internal/namespaces/k8s/v1/custom_node.go b/internal/namespaces/k8s/v1/custom_node.go
index cd8be2dd..192021b7 100644
--- a/internal/namespaces/k8s/v1/custom_node.go
+++ b/internal/namespaces/k8s/v1/custom_node.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/k8s/v1/custom_pool.go b/internal/namespaces/k8s/v1/custom_pool.go
index 895de584..5289063a 100644
--- a/internal/namespaces/k8s/v1/custom_pool.go
+++ b/internal/namespaces/k8s/v1/custom_pool.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/k8s/v1/custom_version.go b/internal/namespaces/k8s/v1/custom_version.go
index bf83fe78..4c479ff5 100644
--- a/internal/namespaces/k8s/v1/custom_version.go
+++ b/internal/namespaces/k8s/v1/custom_version.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-version"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/k8s/v1/k8s_cli.go b/internal/namespaces/k8s/v1/k8s_cli.go
index f67a5305..1a2c1715 100644
--- a/internal/namespaces/k8s/v1/k8s_cli.go
+++ b/internal/namespaces/k8s/v1/k8s_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/key_manager/v1alpha1/custom.go b/internal/namespaces/key_manager/v1alpha1/custom.go
index e9b4edbf..32642c9b 100644
--- a/internal/namespaces/key_manager/v1alpha1/custom.go
+++ b/internal/namespaces/key_manager/v1alpha1/custom.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
 )
 
diff --git a/internal/namespaces/key_manager/v1alpha1/key_manager_cli.go b/internal/namespaces/key_manager/v1alpha1/key_manager_cli.go
index a1b0ff98..34f74661 100644
--- a/internal/namespaces/key_manager/v1alpha1/key_manager_cli.go
+++ b/internal/namespaces/key_manager/v1alpha1/key_manager_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/lb/v1/custom.go b/internal/namespaces/lb/v1/custom.go
index e28fa02e..06bd53cc 100644
--- a/internal/namespaces/lb/v1/custom.go
+++ b/internal/namespaces/lb/v1/custom.go
@@ -2,7 +2,7 @@ package lb
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/terminal"
 	"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
diff --git a/internal/namespaces/lb/v1/custom_acl.go b/internal/namespaces/lb/v1/custom_acl.go
index 2321b3f5..a0ebe1c6 100644
--- a/internal/namespaces/lb/v1/custom_acl.go
+++ b/internal/namespaces/lb/v1/custom_acl.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
 )
diff --git a/internal/namespaces/lb/v1/custom_backend.go b/internal/namespaces/lb/v1/custom_backend.go
index 94d80088..d51b1712 100644
--- a/internal/namespaces/lb/v1/custom_backend.go
+++ b/internal/namespaces/lb/v1/custom_backend.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
diff --git a/internal/namespaces/lb/v1/custom_certificate.go b/internal/namespaces/lb/v1/custom_certificate.go
index 606b9b03..6a8cffaf 100644
--- a/internal/namespaces/lb/v1/custom_certificate.go
+++ b/internal/namespaces/lb/v1/custom_certificate.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/lb/v1/custom_frontend.go b/internal/namespaces/lb/v1/custom_frontend.go
index fe90fcbd..610c7412 100644
--- a/internal/namespaces/lb/v1/custom_frontend.go
+++ b/internal/namespaces/lb/v1/custom_frontend.go
@@ -3,7 +3,7 @@ package lb
 import (
 	"context"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
 )
diff --git a/internal/namespaces/lb/v1/custom_lb.go b/internal/namespaces/lb/v1/custom_lb.go
index 692bb32d..339fd15c 100644
--- a/internal/namespaces/lb/v1/custom_lb.go
+++ b/internal/namespaces/lb/v1/custom_lb.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/lb/v1/lb_cli.go b/internal/namespaces/lb/v1/lb_cli.go
index 333165e3..3085168e 100644
--- a/internal/namespaces/lb/v1/lb_cli.go
+++ b/internal/namespaces/lb/v1/lb_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/login/login.go b/internal/namespaces/login/login.go
index 839e918a..1e8be3db 100644
--- a/internal/namespaces/login/login.go
+++ b/internal/namespaces/login/login.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	initCommand "github.com/scaleway/scaleway-cli/v2/internal/namespaces/init"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/login/webcallback"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
diff --git a/internal/namespaces/marketplace/v2/custom.go b/internal/namespaces/marketplace/v2/custom.go
index 621559c7..1b8a5f09 100644
--- a/internal/namespaces/marketplace/v2/custom.go
+++ b/internal/namespaces/marketplace/v2/custom.go
@@ -1,7 +1,7 @@
 package marketplace
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 // custom_marshal: contains all the registered MarshalFunc and the human.Marshaler implementations
diff --git a/internal/namespaces/marketplace/v2/marketplace_cli.go b/internal/namespaces/marketplace/v2/marketplace_cli.go
index 53b24f1e..6b23510d 100644
--- a/internal/namespaces/marketplace/v2/marketplace_cli.go
+++ b/internal/namespaces/marketplace/v2/marketplace_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v2"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/marketplace/v2/updated_commands.go b/internal/namespaces/marketplace/v2/updated_commands.go
index 3e787b03..38e9c013 100644
--- a/internal/namespaces/marketplace/v2/updated_commands.go
+++ b/internal/namespaces/marketplace/v2/updated_commands.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v2"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/scaleway-sdk-go/strcase"
diff --git a/internal/namespaces/mnq/v1beta1/custom.go b/internal/namespaces/mnq/v1beta1/custom.go
index f6f27d13..9e94eea1 100644
--- a/internal/namespaces/mnq/v1beta1/custom.go
+++ b/internal/namespaces/mnq/v1beta1/custom.go
@@ -1,7 +1,7 @@
 package mnq
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
 )
diff --git a/internal/namespaces/mnq/v1beta1/custom_nats.go b/internal/namespaces/mnq/v1beta1/custom_nats.go
index 52b0ea01..be7eb077 100644
--- a/internal/namespaces/mnq/v1beta1/custom_nats.go
+++ b/internal/namespaces/mnq/v1beta1/custom_nats.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/mnq/v1beta1/custom_nats_helpers.go b/internal/namespaces/mnq/v1beta1/custom_nats_helpers.go
index 363b38ef..58ed102f 100644
--- a/internal/namespaces/mnq/v1beta1/custom_nats_helpers.go
+++ b/internal/namespaces/mnq/v1beta1/custom_nats_helpers.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/mnq/v1beta1/custom_sns.go b/internal/namespaces/mnq/v1beta1/custom_sns.go
index eb98dd94..0a99b08f 100644
--- a/internal/namespaces/mnq/v1beta1/custom_sns.go
+++ b/internal/namespaces/mnq/v1beta1/custom_sns.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
 )
 
diff --git a/internal/namespaces/mnq/v1beta1/custom_sqs.go b/internal/namespaces/mnq/v1beta1/custom_sqs.go
index 6691c7d4..2d86e4fb 100644
--- a/internal/namespaces/mnq/v1beta1/custom_sqs.go
+++ b/internal/namespaces/mnq/v1beta1/custom_sqs.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
 )
diff --git a/internal/namespaces/mnq/v1beta1/mnq_cli.go b/internal/namespaces/mnq/v1beta1/mnq_cli.go
index 1155f156..6edf6c9e 100644
--- a/internal/namespaces/mnq/v1beta1/mnq_cli.go
+++ b/internal/namespaces/mnq/v1beta1/mnq_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	mnq "github.com/scaleway/scaleway-sdk-go/api/mnq/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/object/v1/custom.go b/internal/namespaces/object/v1/custom.go
index 1e02e70d..d3d96229 100644
--- a/internal/namespaces/object/v1/custom.go
+++ b/internal/namespaces/object/v1/custom.go
@@ -2,7 +2,7 @@ package object
 
 import (
 	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 )
 
diff --git a/internal/namespaces/object/v1/custom_bucket.go b/internal/namespaces/object/v1/custom_bucket.go
index 09dde6d7..75cc1a0d 100644
--- a/internal/namespaces/object/v1/custom_bucket.go
+++ b/internal/namespaces/object/v1/custom_bucket.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/object/v1/custom_config_get.go b/internal/namespaces/object/v1/custom_config_get.go
index d2f579ce..fc1c0c8d 100644
--- a/internal/namespaces/object/v1/custom_config_get.go
+++ b/internal/namespaces/object/v1/custom_config_get.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/object/v1/custom_config_install.go b/internal/namespaces/object/v1/custom_config_install.go
index 7254ab92..0cfd6625 100644
--- a/internal/namespaces/object/v1/custom_config_install.go
+++ b/internal/namespaces/object/v1/custom_config_install.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/object/v1/s3_helpers.go b/internal/namespaces/object/v1/s3_helpers.go
index 642e0296..191cb79b 100644
--- a/internal/namespaces/object/v1/s3_helpers.go
+++ b/internal/namespaces/object/v1/s3_helpers.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/object/v1/s3configfile.go b/internal/namespaces/object/v1/s3configfile.go
index 0baf1226..52e8ce5f 100644
--- a/internal/namespaces/object/v1/s3configfile.go
+++ b/internal/namespaces/object/v1/s3configfile.go
@@ -8,7 +8,7 @@ import (
 	"path"
 	"text/template"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/rdb/v1/custom.go b/internal/namespaces/rdb/v1/custom.go
index d46f3d17..39cd8908 100644
--- a/internal/namespaces/rdb/v1/custom.go
+++ b/internal/namespaces/rdb/v1/custom.go
@@ -1,7 +1,7 @@
 package rdb
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 )
diff --git a/internal/namespaces/rdb/v1/custom_acl.go b/internal/namespaces/rdb/v1/custom_acl.go
index 74e558cd..ea71e1c9 100644
--- a/internal/namespaces/rdb/v1/custom_acl.go
+++ b/internal/namespaces/rdb/v1/custom_acl.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/editor"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
diff --git a/internal/namespaces/rdb/v1/custom_backup.go b/internal/namespaces/rdb/v1/custom_backup.go
index fdb7a00b..58930658 100644
--- a/internal/namespaces/rdb/v1/custom_backup.go
+++ b/internal/namespaces/rdb/v1/custom_backup.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
diff --git a/internal/namespaces/rdb/v1/custom_endpoint.go b/internal/namespaces/rdb/v1/custom_endpoint.go
index e631216d..f9b4504a 100644
--- a/internal/namespaces/rdb/v1/custom_endpoint.go
+++ b/internal/namespaces/rdb/v1/custom_endpoint.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/rdb/v1/custom_engine.go b/internal/namespaces/rdb/v1/custom_engine.go
index 442fd345..8a4dca1f 100644
--- a/internal/namespaces/rdb/v1/custom_engine.go
+++ b/internal/namespaces/rdb/v1/custom_engine.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 )
 
diff --git a/internal/namespaces/rdb/v1/custom_engine_settings.go b/internal/namespaces/rdb/v1/custom_engine_settings.go
index aed120d0..2ec5abe7 100644
--- a/internal/namespaces/rdb/v1/custom_engine_settings.go
+++ b/internal/namespaces/rdb/v1/custom_engine_settings.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/rdb/v1/custom_instance.go b/internal/namespaces/rdb/v1/custom_instance.go
index e1b6cddb..c647334c 100644
--- a/internal/namespaces/rdb/v1/custom_instance.go
+++ b/internal/namespaces/rdb/v1/custom_instance.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/passwordgenerator"
diff --git a/internal/namespaces/rdb/v1/custom_log.go b/internal/namespaces/rdb/v1/custom_log.go
index eb87f32f..2fe3fc57 100644
--- a/internal/namespaces/rdb/v1/custom_log.go
+++ b/internal/namespaces/rdb/v1/custom_log.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/rdb/v1/custom_url.go b/internal/namespaces/rdb/v1/custom_url.go
index ffaf12d0..294e0e34 100644
--- a/internal/namespaces/rdb/v1/custom_url.go
+++ b/internal/namespaces/rdb/v1/custom_url.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/rdb/v1/custom_user.go b/internal/namespaces/rdb/v1/custom_user.go
index 4b55587d..b0879212 100644
--- a/internal/namespaces/rdb/v1/custom_user.go
+++ b/internal/namespaces/rdb/v1/custom_user.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/passwordgenerator"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/internal/namespaces/rdb/v1/rdb_cli.go
index b2c9688e..5f3324e4 100644
--- a/internal/namespaces/rdb/v1/rdb_cli.go
+++ b/internal/namespaces/rdb/v1/rdb_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/redis/v1/custom.go b/internal/namespaces/redis/v1/custom.go
index d45c404c..1e5cdee1 100644
--- a/internal/namespaces/redis/v1/custom.go
+++ b/internal/namespaces/redis/v1/custom.go
@@ -1,7 +1,7 @@
 package redis
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/redis/v1"
 )
diff --git a/internal/namespaces/redis/v1/custom_cluster.go b/internal/namespaces/redis/v1/custom_cluster.go
index 4b427e68..b47b558f 100644
--- a/internal/namespaces/redis/v1/custom_cluster.go
+++ b/internal/namespaces/redis/v1/custom_cluster.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/redis/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/redis/v1/redis_cli.go b/internal/namespaces/redis/v1/redis_cli.go
index acd4366b..879856de 100644
--- a/internal/namespaces/redis/v1/redis_cli.go
+++ b/internal/namespaces/redis/v1/redis_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/redis/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/registry/v1/custom.go b/internal/namespaces/registry/v1/custom.go
index acd657e4..263b32e8 100644
--- a/internal/namespaces/registry/v1/custom.go
+++ b/internal/namespaces/registry/v1/custom.go
@@ -1,7 +1,7 @@
 package registry
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 )
diff --git a/internal/namespaces/registry/v1/custom_docker_helper.go b/internal/namespaces/registry/v1/custom_docker_helper.go
index 47da0074..49d8aa34 100644
--- a/internal/namespaces/registry/v1/custom_docker_helper.go
+++ b/internal/namespaces/registry/v1/custom_docker_helper.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/registry/v1/custom_image.go b/internal/namespaces/registry/v1/custom_image.go
index 3d86e96a..183890b6 100644
--- a/internal/namespaces/registry/v1/custom_image.go
+++ b/internal/namespaces/registry/v1/custom_image.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/registry/v1/custom_login.go b/internal/namespaces/registry/v1/custom_login.go
index 9488af7e..b0686c1e 100644
--- a/internal/namespaces/registry/v1/custom_login.go
+++ b/internal/namespaces/registry/v1/custom_login.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/registry/v1/custom_logout.go b/internal/namespaces/registry/v1/custom_logout.go
index d74e4c1a..41dce6e8 100644
--- a/internal/namespaces/registry/v1/custom_logout.go
+++ b/internal/namespaces/registry/v1/custom_logout.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/registry/v1/custom_tag.go b/internal/namespaces/registry/v1/custom_tag.go
index f9ac4305..65e4d6ef 100644
--- a/internal/namespaces/registry/v1/custom_tag.go
+++ b/internal/namespaces/registry/v1/custom_tag.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 	"github.com/scaleway/scaleway-sdk-go/logger"
diff --git a/internal/namespaces/registry/v1/helpers_docker.go b/internal/namespaces/registry/v1/helpers_docker.go
index 8e38bcde..3947bd1c 100644
--- a/internal/namespaces/registry/v1/helpers_docker.go
+++ b/internal/namespaces/registry/v1/helpers_docker.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/registry/v1/registry_cli.go b/internal/namespaces/registry/v1/registry_cli.go
index 577a0378..16464403 100644
--- a/internal/namespaces/registry/v1/registry_cli.go
+++ b/internal/namespaces/registry/v1/registry_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/secret/v1beta1/custom.go b/internal/namespaces/secret/v1beta1/custom.go
index 3fbf7b6e..a03ea0b0 100644
--- a/internal/namespaces/secret/v1beta1/custom.go
+++ b/internal/namespaces/secret/v1beta1/custom.go
@@ -1,7 +1,7 @@
 package secret
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	secret "github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1"
 )
 
diff --git a/internal/namespaces/secret/v1beta1/custom_secret_version.go b/internal/namespaces/secret/v1beta1/custom_secret_version.go
index 9f25a017..6bd67170 100644
--- a/internal/namespaces/secret/v1beta1/custom_secret_version.go
+++ b/internal/namespaces/secret/v1beta1/custom_secret_version.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	secret "github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1"
 )
 
diff --git a/internal/namespaces/secret/v1beta1/secret_cli.go b/internal/namespaces/secret/v1beta1/secret_cli.go
index 5e5b8be3..98192a3c 100644
--- a/internal/namespaces/secret/v1beta1/secret_cli.go
+++ b/internal/namespaces/secret/v1beta1/secret_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	secret "github.com/scaleway/scaleway-sdk-go/api/secret/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/serverless_sqldb/v1alpha1/custom.go b/internal/namespaces/serverless_sqldb/v1alpha1/custom.go
index 4df8d562..c0b4371f 100644
--- a/internal/namespaces/serverless_sqldb/v1alpha1/custom.go
+++ b/internal/namespaces/serverless_sqldb/v1alpha1/custom.go
@@ -2,7 +2,7 @@ package serverless_sqldb
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	serverless_sqldb "github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1"
 )
diff --git a/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go b/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go
index 9e230664..df9166af 100644
--- a/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go
+++ b/internal/namespaces/serverless_sqldb/v1alpha1/serverless_sqldb_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	serverless_sqldb "github.com/scaleway/scaleway-sdk-go/api/serverless_sqldb/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/shell/shell.go b/internal/namespaces/shell/shell.go
index a0617975..01d25a3e 100644
--- a/internal/namespaces/shell/shell.go
+++ b/internal/namespaces/shell/shell.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"reflect"
 
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/tem/v1alpha1/custom.go b/internal/namespaces/tem/v1alpha1/custom.go
index a4845b04..4076437c 100644
--- a/internal/namespaces/tem/v1alpha1/custom.go
+++ b/internal/namespaces/tem/v1alpha1/custom.go
@@ -1,7 +1,7 @@
 package tem
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	tem "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1"
 )
diff --git a/internal/namespaces/tem/v1alpha1/custom_domain.go b/internal/namespaces/tem/v1alpha1/custom_domain.go
index a709bc49..2b262426 100644
--- a/internal/namespaces/tem/v1alpha1/custom_domain.go
+++ b/internal/namespaces/tem/v1alpha1/custom_domain.go
@@ -2,7 +2,7 @@ package tem
 
 import (
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	tem "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1"
 )
diff --git a/internal/namespaces/tem/v1alpha1/tem_cli.go b/internal/namespaces/tem/v1alpha1/tem_cli.go
index 63179494..c9dfa028 100644
--- a/internal/namespaces/tem/v1alpha1/tem_cli.go
+++ b/internal/namespaces/tem/v1alpha1/tem_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	tem "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/namespaces/version/version.go b/internal/namespaces/version/version.go
index 9798f402..c111493a 100644
--- a/internal/namespaces/version/version.go
+++ b/internal/namespaces/version/version.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/vpc/v2/custom.go b/internal/namespaces/vpc/v2/custom.go
index 84f337b7..a2d39ba0 100644
--- a/internal/namespaces/vpc/v2/custom.go
+++ b/internal/namespaces/vpc/v2/custom.go
@@ -1,7 +1,7 @@
 package vpc
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
 )
diff --git a/internal/namespaces/vpc/v2/custom_private_network.go b/internal/namespaces/vpc/v2/custom_private_network.go
index 1dbda781..57902662 100644
--- a/internal/namespaces/vpc/v2/custom_private_network.go
+++ b/internal/namespaces/vpc/v2/custom_private_network.go
@@ -3,7 +3,7 @@ package vpc
 import (
 	"context"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
diff --git a/internal/namespaces/vpc/v2/vpc_cli.go b/internal/namespaces/vpc/v2/vpc_cli.go
index 3f8f17d9..a5315012 100644
--- a/internal/namespaces/vpc/v2/vpc_cli.go
+++ b/internal/namespaces/vpc/v2/vpc_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/vpc/v2"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/vpcgw/v1/custom.go b/internal/namespaces/vpcgw/v1/custom.go
index 91a37545..185a6f20 100644
--- a/internal/namespaces/vpcgw/v1/custom.go
+++ b/internal/namespaces/vpcgw/v1/custom.go
@@ -1,7 +1,7 @@
 package vpcgw
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
 )
diff --git a/internal/namespaces/vpcgw/v1/custom_gateway.go b/internal/namespaces/vpcgw/v1/custom_gateway.go
index e3333bd0..d2d34513 100644
--- a/internal/namespaces/vpcgw/v1/custom_gateway.go
+++ b/internal/namespaces/vpcgw/v1/custom_gateway.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/vpcgw/v1/custom_gateway_network.go b/internal/namespaces/vpcgw/v1/custom_gateway_network.go
index 690c3ea6..e5cd19e3 100644
--- a/internal/namespaces/vpcgw/v1/custom_gateway_network.go
+++ b/internal/namespaces/vpcgw/v1/custom_gateway_network.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/fatih/color"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/vpcgw/v1/custom_gateway_type.go b/internal/namespaces/vpcgw/v1/custom_gateway_type.go
index 8ce1bc5b..a872d496 100644
--- a/internal/namespaces/vpcgw/v1/custom_gateway_type.go
+++ b/internal/namespaces/vpcgw/v1/custom_gateway_type.go
@@ -3,7 +3,7 @@ package vpcgw
 import (
 	"context"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
 )
 
diff --git a/internal/namespaces/vpcgw/v1/vpcgw_cli.go b/internal/namespaces/vpcgw/v1/vpcgw_cli.go
index 34ae57a4..c4e1ddd4 100644
--- a/internal/namespaces/vpcgw/v1/vpcgw_cli.go
+++ b/internal/namespaces/vpcgw/v1/vpcgw_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/webhosting/v1alpha1/custom.go b/internal/namespaces/webhosting/v1alpha1/custom.go
index 7f8408fa..3e981ccc 100644
--- a/internal/namespaces/webhosting/v1alpha1/custom.go
+++ b/internal/namespaces/webhosting/v1alpha1/custom.go
@@ -1,7 +1,7 @@
 package webhosting
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	webhosting "github.com/scaleway/scaleway-sdk-go/api/webhosting/v1alpha1"
 )
diff --git a/internal/namespaces/webhosting/v1alpha1/custom_offer.go b/internal/namespaces/webhosting/v1alpha1/custom_offer.go
index e7b4b6b9..10e212ce 100644
--- a/internal/namespaces/webhosting/v1alpha1/custom_offer.go
+++ b/internal/namespaces/webhosting/v1alpha1/custom_offer.go
@@ -1,6 +1,6 @@
 package webhosting
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func webhostingOfferListBuilder(c *core.Command) *core.Command {
 	c.View = &core.View{
diff --git a/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go b/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go
index ae14cfb2..bb7d2eb0 100644
--- a/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go
+++ b/internal/namespaces/webhosting/v1alpha1/webhosting_cli.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-sdk-go/api/webhosting/v1alpha1"
+	"github.com/scaleway/scaleway-cli/v2/core"
+	webhosting "github.com/scaleway/scaleway-sdk-go/api/webhosting/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/qa/argspec.go b/internal/qa/argspec.go
index f091bed6..c384d7a3 100644
--- a/internal/qa/argspec.go
+++ b/internal/qa/argspec.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 )
 
 type ArgSpecInvalidError struct {
diff --git a/internal/qa/example.go b/internal/qa/example.go
index bb2007ba..ed802ed2 100644
--- a/internal/qa/example.go
+++ b/internal/qa/example.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 type CommandInvalidJSONExampleError struct {
diff --git a/internal/qa/ignore.go b/internal/qa/ignore.go
index 4d155b5c..4836d991 100644
--- a/internal/qa/ignore.go
+++ b/internal/qa/ignore.go
@@ -3,8 +3,8 @@ package qa
 import (
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
+	"github.com/scaleway/scaleway-cli/v2/commands"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func filterIgnore(unfilteredErrors []error) []error {
@@ -47,14 +47,14 @@ func areCommandsEquals(c1 *core.Command, c2 *core.Command) bool {
 var ignoredErrors = []ignoredError{
 	{
 		Type:    reflect.TypeOf(&DifferentLocalizationForNamespaceError{}),
-		Command: namespaces.GetCommands().MustFind("k8s", "kubeconfig", "uninstall"),
+		Command: commands.GetCommands().MustFind("k8s", "kubeconfig", "uninstall"),
 	},
 	{
 		Type:    reflect.TypeOf(&DifferentLocalizationForNamespaceError{}),
-		Command: namespaces.GetCommands().MustFind("registry", "logout"),
+		Command: commands.GetCommands().MustFind("registry", "logout"),
 	},
 	{
 		Type:    reflect.TypeOf(&DifferentLocalizationForNamespaceError{}),
-		Command: namespaces.GetCommands().MustFind("registry", "login"),
+		Command: commands.GetCommands().MustFind("registry", "login"),
 	},
 }
diff --git a/internal/qa/qa.go b/internal/qa/qa.go
index cdbd9dd8..c23b28b2 100644
--- a/internal/qa/qa.go
+++ b/internal/qa/qa.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func LintCommands(commands *core.Commands) []error {
diff --git a/internal/qa/seealso.go b/internal/qa/seealso.go
index b68460dc..40ff4a46 100644
--- a/internal/qa/seealso.go
+++ b/internal/qa/seealso.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 type CommandInvalidSeeAlsoError struct {
diff --git a/internal/wasm/autocomplete.go b/internal/wasm/autocomplete.go
index eebde41a..f422eac1 100644
--- a/internal/wasm/autocomplete.go
+++ b/internal/wasm/autocomplete.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 type AutoCompleteConfig struct {
diff --git a/internal/wasm/run.go b/internal/wasm/run.go
index f84c4097..3f962a3a 100644
--- a/internal/wasm/run.go
+++ b/internal/wasm/run.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
+	cmds "github.com/scaleway/scaleway-cli/v2/commands"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/platform/web"
 )
 
@@ -16,7 +16,7 @@ var commands *core.Commands
 
 func getCommands() *core.Commands {
 	if commands == nil {
-		commands = namespaces.GetCommands()
+		commands = cmds.GetCommands()
 	}
 	return commands
 }


Test patch:
diff --git a/cmd/scw-wasm-tester/human.go b/cmd/scw-wasm-tester/human.go
index 898bd623..bca8f86b 100644
--- a/cmd/scw-wasm-tester/human.go
+++ b/cmd/scw-wasm-tester/human.go
@@ -6,7 +6,7 @@ import (
 	"syscall/js"
 
 	"github.com/hashicorp/go-version"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 )
 
diff --git a/cmd/scw/main_test.go b/cmd/scw/main_test.go
index 2b27ac04..ced558f3 100644
--- a/cmd/scw/main_test.go
+++ b/cmd/scw/main_test.go
@@ -4,13 +4,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
+	"github.com/scaleway/scaleway-cli/v2/commands"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func Test_MainUsage(t *testing.T) {
 	t.Run("usage", core.Test(&core.TestConfig{
-		Commands: namespaces.GetCommands(),
+		Commands: commands.GetCommands(),
 		Cmd:      "scw -h",
 		Check: core.TestCheckCombine(
 			core.TestCheckExitCode(0),
@@ -27,7 +27,7 @@ func Test_AllUsage(t *testing.T) {
 		"autocomplete script": true,
 	}
 
-	for _, cmd := range namespaces.GetCommands().GetAll() {
+	for _, cmd := range commands.GetCommands().GetAll() {
 		commandLine := cmd.GetCommandLine("scw")
 		commandLine = strings.TrimPrefix(commandLine, "scw ")
 		if _, exists := excludedCommands[commandLine]; exists || cmd.Hidden {
@@ -35,7 +35,7 @@ func Test_AllUsage(t *testing.T) {
 		}
 
 		t.Run(commandLine+" usage", core.Test(&core.TestConfig{
-			Commands: namespaces.GetCommands(),
+			Commands: commands.GetCommands(),
 			Cmd:      "scw " + commandLine + " -h",
 			Check: core.TestCheckCombine(
 				core.TestCheckExitCode(0),
diff --git a/cmd/scw/web_test.go b/cmd/scw/web_test.go
index 4180a702..f788ef6e 100644
--- a/cmd/scw/web_test.go
+++ b/cmd/scw/web_test.go
@@ -6,11 +6,11 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
+	"github.com/scaleway/scaleway-cli/v2/commands"
 )
 
 func Test_WebValidateTemplates(t *testing.T) {
-	cmds := namespaces.GetCommands()
+	cmds := commands.GetCommands()
 
 	// Test that web urls are valid templates
 	type failedTemplate struct {
@@ -37,7 +37,7 @@ func Test_WebValidateTemplates(t *testing.T) {
 }
 
 func Test_WebValidateTemplatesVariables(t *testing.T) {
-	cmds := namespaces.GetCommands()
+	cmds := commands.GetCommands()
 
 	// Test that web urls are valid templates
 	type failedTemplate struct {
diff --git a/internal/core/alias.go b/core/alias.go
similarity index 100%
rename from internal/core/alias.go
rename to core/alias.go
diff --git a/internal/core/alias_test.go b/core/alias_test.go
similarity index 96%
rename from internal/core/alias_test.go
rename to core/alias_test.go
index 2d85e24f..a44b8c2c 100644
--- a/internal/core/alias_test.go
+++ b/core/alias_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/alias"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 )
 
 func TestCommandMatchAlias(t *testing.T) {
diff --git a/internal/core/arg_file_content.go b/core/arg_file_content.go
similarity index 100%
rename from internal/core/arg_file_content.go
rename to core/arg_file_content.go
diff --git a/internal/core/arg_specs.go b/core/arg_specs.go
similarity index 100%
rename from internal/core/arg_specs.go
rename to core/arg_specs.go
diff --git a/internal/core/arg_specs_test.go b/core/arg_specs_test.go
similarity index 93%
rename from internal/core/arg_specs_test.go
rename to core/arg_specs_test.go
index 584b8f9e..772cbfef 100644
--- a/internal/core/arg_specs_test.go
+++ b/core/arg_specs_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func TestOneOf(t *testing.T) {
diff --git a/internal/core/autocomplete.go b/core/autocomplete.go
similarity index 100%
rename from internal/core/autocomplete.go
rename to core/autocomplete.go
diff --git a/internal/core/autocomplete_test.go b/core/autocomplete_test.go
similarity index 99%
rename from internal/core/autocomplete_test.go
rename to core/autocomplete_test.go
index c63b12d1..043f642a 100644
--- a/internal/core/autocomplete_test.go
+++ b/core/autocomplete_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/platform/terminal"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/assert"
diff --git a/internal/core/autocomplete_utils.go b/core/autocomplete_utils.go
similarity index 100%
rename from internal/core/autocomplete_utils.go
rename to core/autocomplete_utils.go
diff --git a/internal/core/bootstrap.go b/core/bootstrap.go
similarity index 100%
rename from internal/core/bootstrap.go
rename to core/bootstrap.go
diff --git a/internal/core/bootstrap_test.go b/core/bootstrap_test.go
similarity index 98%
rename from internal/core/bootstrap_test.go
rename to core/bootstrap_test.go
index c77f77ed..03fb1b8e 100644
--- a/internal/core/bootstrap_test.go
+++ b/core/bootstrap_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 )
 
diff --git a/internal/core/build_info.go b/core/build_info.go
similarity index 100%
rename from internal/core/build_info.go
rename to core/build_info.go
diff --git a/internal/core/build_info_test.go b/core/build_info_test.go
similarity index 98%
rename from internal/core/build_info_test.go
rename to core/build_info_test.go
index 28bb310a..4c86f43e 100644
--- a/internal/core/build_info_test.go
+++ b/core/build_info_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/alecthomas/assert"
 	"github.com/hashicorp/go-version"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/core/checks.go b/core/checks.go
similarity index 100%
rename from internal/core/checks.go
rename to core/checks.go
diff --git a/internal/core/checks_test.go b/core/checks_test.go
similarity index 97%
rename from internal/core/checks_test.go
rename to core/checks_test.go
index c87b809a..96cacf29 100644
--- a/internal/core/checks_test.go
+++ b/core/checks_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/core/client.go b/core/client.go
similarity index 100%
rename from internal/core/client.go
rename to core/client.go
diff --git a/internal/core/cobra_builder.go b/core/cobra_builder.go
similarity index 100%
rename from internal/core/cobra_builder.go
rename to core/cobra_builder.go
diff --git a/internal/core/cobra_builder_test.go b/core/cobra_builder_test.go
similarity index 97%
rename from internal/core/cobra_builder_test.go
rename to core/cobra_builder_test.go
index 4c67b89f..991841df 100644
--- a/internal/core/cobra_builder_test.go
+++ b/core/cobra_builder_test.go
@@ -3,7 +3,7 @@ package core_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func Test_UnknownCommand(t *testing.T) {
diff --git a/internal/core/cobra_usage_builder.go b/core/cobra_usage_builder.go
similarity index 100%
rename from internal/core/cobra_usage_builder.go
rename to core/cobra_usage_builder.go
diff --git a/internal/core/cobra_usage_builder_test.go b/core/cobra_usage_builder_test.go
similarity index 97%
rename from internal/core/cobra_usage_builder_test.go
rename to core/cobra_usage_builder_test.go
index b5787dc7..75955e3c 100644
--- a/internal/core/cobra_usage_builder_test.go
+++ b/core/cobra_usage_builder_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 type ServerColor string
diff --git a/internal/core/cobra_utils.go b/core/cobra_utils.go
similarity index 100%
rename from internal/core/cobra_utils.go
rename to core/cobra_utils.go
diff --git a/internal/core/cobra_utils_test.go b/core/cobra_utils_test.go
similarity index 99%
rename from internal/core/cobra_utils_test.go
rename to core/cobra_utils_test.go
index 21cd3b1e..356c7ebe 100644
--- a/internal/core/cobra_utils_test.go
+++ b/core/cobra_utils_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/core/command.go b/core/command.go
similarity index 100%
rename from internal/core/command.go
rename to core/command.go
diff --git a/internal/core/command_interceptor.go b/core/command_interceptor.go
similarity index 100%
rename from internal/core/command_interceptor.go
rename to core/command_interceptor.go
diff --git a/internal/core/command_interceptor_test.go b/core/command_interceptor_test.go
similarity index 96%
rename from internal/core/command_interceptor_test.go
rename to core/command_interceptor_test.go
index c39e8c50..d5edcece 100644
--- a/internal/core/command_interceptor_test.go
+++ b/core/command_interceptor_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func Test_CombineCommandInterceptor(t *testing.T) {
diff --git a/internal/core/context.go b/core/context.go
similarity index 100%
rename from internal/core/context.go
rename to core/context.go
diff --git a/internal/core/default.go b/core/default.go
similarity index 100%
rename from internal/core/default.go
rename to core/default.go
diff --git a/internal/core/default_test.go b/core/default_test.go
similarity index 98%
rename from internal/core/default_test.go
rename to core/default_test.go
index e96b8b51..2e5cc544 100644
--- a/internal/core/default_test.go
+++ b/core/default_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 )
 
 func Test_ApplyDefaultValues(t *testing.T) {
diff --git a/internal/core/error.go b/core/error.go
similarity index 100%
rename from internal/core/error.go
rename to core/error.go
diff --git a/internal/core/errors.go b/core/errors.go
similarity index 100%
rename from internal/core/errors.go
rename to core/errors.go
diff --git a/internal/core/errors_cmp.go b/core/errors_cmp.go
similarity index 100%
rename from internal/core/errors_cmp.go
rename to core/errors_cmp.go
diff --git a/internal/core/example.go b/core/example.go
similarity index 100%
rename from internal/core/example.go
rename to core/example.go
diff --git a/internal/core/exec.go b/core/exec.go
similarity index 100%
rename from internal/core/exec.go
rename to core/exec.go
diff --git a/internal/core/http_retry.go b/core/http_retry.go
similarity index 100%
rename from internal/core/http_retry.go
rename to core/http_retry.go
diff --git a/internal/core/logger.go b/core/logger.go
similarity index 100%
rename from internal/core/logger.go
rename to core/logger.go
diff --git a/internal/core/printer.go b/core/printer.go
similarity index 100%
rename from internal/core/printer.go
rename to core/printer.go
diff --git a/internal/core/printer_test.go b/core/printer_test.go
similarity index 99%
rename from internal/core/printer_test.go
rename to core/printer_test.go
index fb0ad2bf..dae7914c 100644
--- a/internal/core/printer_test.go
+++ b/core/printer_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func Test_CorePrinter(t *testing.T) {
diff --git a/internal/core/reflect.go b/core/reflect.go
similarity index 100%
rename from internal/core/reflect.go
rename to core/reflect.go
diff --git a/internal/core/reflect_test.go b/core/reflect_test.go
similarity index 98%
rename from internal/core/reflect_test.go
rename to core/reflect_test.go
index 68f6dc68..f7ca2b7a 100644
--- a/internal/core/reflect_test.go
+++ b/core/reflect_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
diff --git a/internal/core/result.go b/core/result.go
similarity index 100%
rename from internal/core/result.go
rename to core/result.go
diff --git a/internal/core/result_test.go b/core/result_test.go
similarity index 90%
rename from internal/core/result_test.go
rename to core/result_test.go
index 4108ff84..7ba3d260 100644
--- a/internal/core/result_test.go
+++ b/core/result_test.go
@@ -3,7 +3,7 @@ package core_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/core/see_also.go b/core/see_also.go
similarity index 100%
rename from internal/core/see_also.go
rename to core/see_also.go
diff --git a/internal/core/shell.go b/core/shell.go
similarity index 100%
rename from internal/core/shell.go
rename to core/shell.go
diff --git a/internal/core/shell_disabled.go b/core/shell_disabled.go
similarity index 100%
rename from internal/core/shell_disabled.go
rename to core/shell_disabled.go
diff --git a/internal/core/shell_test.go b/core/shell_test.go
similarity index 93%
rename from internal/core/shell_test.go
rename to core/shell_test.go
index c074c8a0..e80c7d90 100644
--- a/internal/core/shell_test.go
+++ b/core/shell_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func TestShell_OptionToArgSpecName(t *testing.T) {
diff --git a/internal/core/socket_passthrough_transport.go b/core/socket_passthrough_transport.go
similarity index 100%
rename from internal/core/socket_passthrough_transport.go
rename to core/socket_passthrough_transport.go
diff --git a/internal/core/testdata/test-check-api-key-basic.cassette.yaml b/core/testdata/test-check-api-key-basic.cassette.yaml
similarity index 100%
rename from internal/core/testdata/test-check-api-key-basic.cassette.yaml
rename to core/testdata/test-check-api-key-basic.cassette.yaml
diff --git a/internal/core/testdata/test-check-api-key-basic.golden b/core/testdata/test-check-api-key-basic.golden
similarity index 100%
rename from internal/core/testdata/test-check-api-key-basic.golden
rename to core/testdata/test-check-api-key-basic.golden
diff --git a/internal/core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml b/core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml
similarity index 100%
rename from internal/core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml
rename to core/testdata/test-check-version-check-more-than24h-ago.cassette.yaml
diff --git a/internal/core/testdata/test-check-version-outdated-version.cassette.yaml b/core/testdata/test-check-version-outdated-version.cassette.yaml
similarity index 100%
rename from internal/core/testdata/test-check-version-outdated-version.cassette.yaml
rename to core/testdata/test-check-version-outdated-version.cassette.yaml
diff --git a/internal/core/testdata/test-check-version-up-to-date-version.cassette.yaml b/core/testdata/test-check-version-up-to-date-version.cassette.yaml
similarity index 100%
rename from internal/core/testdata/test-check-version-up-to-date-version.cassette.yaml
rename to core/testdata/test-check-version-up-to-date-version.cassette.yaml
diff --git a/internal/core/testdata/test-core-printer-human-list-with-options-unknown-column.golden b/core/testdata/test-core-printer-human-list-with-options-unknown-column.golden
similarity index 100%
rename from internal/core/testdata/test-core-printer-human-list-with-options-unknown-column.golden
rename to core/testdata/test-core-printer-human-list-with-options-unknown-column.golden
diff --git a/internal/core/testdata/test-core-printer-human-list-with-options.golden b/core/testdata/test-core-printer-human-list-with-options.golden
similarity index 100%
rename from internal/core/testdata/test-core-printer-human-list-with-options.golden
rename to core/testdata/test-core-printer-human-list-with-options.golden
diff --git a/internal/core/testdata/test-core-printer-human-list-without-option.golden b/core/testdata/test-core-printer-human-list-without-option.golden
similarity index 100%
rename from internal/core/testdata/test-core-printer-human-list-without-option.golden
rename to core/testdata/test-core-printer-human-list-without-option.golden
diff --git a/internal/core/testdata/test-core-printer-human-simple-with-options.golden b/core/testdata/test-core-printer-human-simple-with-options.golden
similarity index 100%
rename from internal/core/testdata/test-core-printer-human-simple-with-options.golden
rename to core/testdata/test-core-printer-human-simple-with-options.golden
diff --git a/internal/core/testdata/test-core-printer-human-simple-without-option.golden b/core/testdata/test-core-printer-human-simple-without-option.golden
similarity index 100%
rename from internal/core/testdata/test-core-printer-human-simple-without-option.golden
rename to core/testdata/test-core-printer-human-simple-without-option.golden
diff --git a/internal/core/testdata/test-deprecated-command#00.golden b/core/testdata/test-deprecated-command#00.golden
similarity index 100%
rename from internal/core/testdata/test-deprecated-command#00.golden
rename to core/testdata/test-deprecated-command#00.golden
diff --git a/internal/core/testdata/test-interrupt-error-empty-error-json.golden b/core/testdata/test-interrupt-error-empty-error-json.golden
similarity index 100%
rename from internal/core/testdata/test-interrupt-error-empty-error-json.golden
rename to core/testdata/test-interrupt-error-empty-error-json.golden
diff --git a/internal/core/testdata/test-interrupt-error-empty-error.golden b/core/testdata/test-interrupt-error-empty-error.golden
similarity index 100%
rename from internal/core/testdata/test-interrupt-error-empty-error.golden
rename to core/testdata/test-interrupt-error-empty-error.golden
diff --git a/internal/core/testdata/test-interrupt-error-empty-success-json.golden b/core/testdata/test-interrupt-error-empty-success-json.golden
similarity index 100%
rename from internal/core/testdata/test-interrupt-error-empty-success-json.golden
rename to core/testdata/test-interrupt-error-empty-success-json.golden
diff --git a/internal/core/testdata/test-interrupt-error-empty-success.golden b/core/testdata/test-interrupt-error-empty-success.golden
similarity index 100%
rename from internal/core/testdata/test-interrupt-error-empty-success.golden
rename to core/testdata/test-interrupt-error-empty-success.golden
diff --git a/internal/core/testdata/test-multi-positional-arg-multi-positional-with-multi-positional.golden b/core/testdata/test-multi-positional-arg-multi-positional-with-multi-positional.golden
similarity index 100%
rename from internal/core/testdata/test-multi-positional-arg-multi-positional-with-multi-positional.golden
rename to core/testdata/test-multi-positional-arg-multi-positional-with-multi-positional.golden
diff --git a/internal/core/testdata/test-multi-positional-arg-multi-positional-with-one-positional.golden b/core/testdata/test-multi-positional-arg-multi-positional-with-one-positional.golden
similarity index 100%
rename from internal/core/testdata/test-multi-positional-arg-multi-positional-with-one-positional.golden
rename to core/testdata/test-multi-positional-arg-multi-positional-with-one-positional.golden
diff --git a/internal/core/testdata/test-positional-arg-full-command#01.golden b/core/testdata/test-positional-arg-full-command#01.golden
similarity index 100%
rename from internal/core/testdata/test-positional-arg-full-command#01.golden
rename to core/testdata/test-positional-arg-full-command#01.golden
diff --git a/internal/core/testdata/test-positional-arg-multi-positional-json.golden b/core/testdata/test-positional-arg-multi-positional-json.golden
similarity index 100%
rename from internal/core/testdata/test-positional-arg-multi-positional-json.golden
rename to core/testdata/test-positional-arg-multi-positional-json.golden
diff --git a/internal/core/testdata/test-positional-arg-multi-positional.golden b/core/testdata/test-positional-arg-multi-positional.golden
similarity index 100%
rename from internal/core/testdata/test-positional-arg-multi-positional.golden
rename to core/testdata/test-positional-arg-multi-positional.golden
diff --git a/internal/core/testdata/test-template-printer-nil-slice.golden b/core/testdata/test-template-printer-nil-slice.golden
similarity index 100%
rename from internal/core/testdata/test-template-printer-nil-slice.golden
rename to core/testdata/test-template-printer-nil-slice.golden
diff --git a/internal/core/testdata/test-template-printer-template-list-with-options-unknown-column.golden b/core/testdata/test-template-printer-template-list-with-options-unknown-column.golden
similarity index 100%
rename from internal/core/testdata/test-template-printer-template-list-with-options-unknown-column.golden
rename to core/testdata/test-template-printer-template-list-with-options-unknown-column.golden
diff --git a/internal/core/testdata/test-template-printer-template-list-with-options.golden b/core/testdata/test-template-printer-template-list-with-options.golden
similarity index 100%
rename from internal/core/testdata/test-template-printer-template-list-with-options.golden
rename to core/testdata/test-template-printer-template-list-with-options.golden
diff --git a/internal/core/testdata/test-template-printer-template-list-without-option.golden b/core/testdata/test-template-printer-template-list-without-option.golden
similarity index 100%
rename from internal/core/testdata/test-template-printer-template-list-without-option.golden
rename to core/testdata/test-template-printer-template-list-without-option.golden
diff --git a/internal/core/testdata/test-template-printer-template-simple-with-options.golden b/core/testdata/test-template-printer-template-simple-with-options.golden
similarity index 100%
rename from internal/core/testdata/test-template-printer-template-simple-with-options.golden
rename to core/testdata/test-template-printer-template-simple-with-options.golden
diff --git a/internal/core/testdata/test-template-printer-template-simple-without-option.golden b/core/testdata/test-template-printer-template-simple-without-option.golden
similarity index 100%
rename from internal/core/testdata/test-template-printer-template-simple-without-option.golden
rename to core/testdata/test-template-printer-template-simple-without-option.golden
diff --git a/internal/core/testdata/test-unknown-command-unknown-resource.golden b/core/testdata/test-unknown-command-unknown-resource.golden
similarity index 100%
rename from internal/core/testdata/test-unknown-command-unknown-resource.golden
rename to core/testdata/test-unknown-command-unknown-resource.golden
diff --git a/internal/core/testdata/test-unknown-command-unknown-verb.golden b/core/testdata/test-unknown-command-unknown-verb.golden
similarity index 100%
rename from internal/core/testdata/test-unknown-command-unknown-verb.golden
rename to core/testdata/test-unknown-command-unknown-verb.golden
diff --git a/internal/core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden b/core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden
similarity index 100%
rename from internal/core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden
rename to core/testdata/test-yaml-printer-human-list-with-options-unknown-column.golden
diff --git a/internal/core/testdata/test-yaml-printer-human-list-with-options.golden b/core/testdata/test-yaml-printer-human-list-with-options.golden
similarity index 100%
rename from internal/core/testdata/test-yaml-printer-human-list-with-options.golden
rename to core/testdata/test-yaml-printer-human-list-with-options.golden
diff --git a/internal/core/testdata/test-yaml-printer-human-list-without-option.golden b/core/testdata/test-yaml-printer-human-list-without-option.golden
similarity index 100%
rename from internal/core/testdata/test-yaml-printer-human-list-without-option.golden
rename to core/testdata/test-yaml-printer-human-list-without-option.golden
diff --git a/internal/core/testdata/test-yaml-printer-human-simple-with-options.golden b/core/testdata/test-yaml-printer-human-simple-with-options.golden
similarity index 100%
rename from internal/core/testdata/test-yaml-printer-human-simple-with-options.golden
rename to core/testdata/test-yaml-printer-human-simple-with-options.golden
diff --git a/internal/core/testdata/test-yaml-printer-human-simple-without-option.golden b/core/testdata/test-yaml-printer-human-simple-without-option.golden
similarity index 100%
rename from internal/core/testdata/test-yaml-printer-human-simple-without-option.golden
rename to core/testdata/test-yaml-printer-human-simple-without-option.golden
diff --git a/internal/core/testdata/test-yaml-printer-nil-slice.golden b/core/testdata/test-yaml-printer-nil-slice.golden
similarity index 100%
rename from internal/core/testdata/test-yaml-printer-nil-slice.golden
rename to core/testdata/test-yaml-printer-nil-slice.golden
diff --git a/internal/core/testing.go b/core/testing.go
similarity index 100%
rename from internal/core/testing.go
rename to core/testing.go
diff --git a/internal/core/testing_recorder.go b/core/testing_recorder.go
similarity index 100%
rename from internal/core/testing_recorder.go
rename to core/testing_recorder.go
diff --git a/internal/core/testing_test.go b/core/testing_test.go
similarity index 92%
rename from internal/core/testing_test.go
rename to core/testing_test.go
index 4a650280..b7bee560 100644
--- a/internal/core/testing_test.go
+++ b/core/testing_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func TestGoldenIgnoreLines(t *testing.T) {
diff --git a/internal/core/validate.go b/core/validate.go
similarity index 100%
rename from internal/core/validate.go
rename to core/validate.go
diff --git a/internal/core/validate_test.go b/core/validate_test.go
similarity index 99%
rename from internal/core/validate_test.go
rename to core/validate_test.go
index e82b8999..f83b8ee3 100644
--- a/internal/core/validate_test.go
+++ b/core/validate_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/args"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
 )
 
 type Element struct {
diff --git a/internal/e2e/errors_test.go b/internal/e2e/errors_test.go
index c84d158c..1518b758 100644
--- a/internal/e2e/errors_test.go
+++ b/internal/e2e/errors_test.go
@@ -3,7 +3,7 @@ package e2e_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
 )
 
diff --git a/internal/e2e/human_test.go b/internal/e2e/human_test.go
index 32b75505..db9c4f65 100644
--- a/internal/e2e/human_test.go
+++ b/internal/e2e/human_test.go
@@ -3,7 +3,7 @@ package e2e_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
 )
 
diff --git a/internal/e2e/sdk_errors_test.go b/internal/e2e/sdk_errors_test.go
index d33cd820..94b51d72 100644
--- a/internal/e2e/sdk_errors_test.go
+++ b/internal/e2e/sdk_errors_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/v1"
 	sdktest "github.com/scaleway/scaleway-sdk-go/api/test/v1"
 )
diff --git a/internal/namespaces/alias/alias_test.go b/internal/namespaces/alias/alias_test.go
index 71865273..2d079314 100644
--- a/internal/namespaces/alias/alias_test.go
+++ b/internal/namespaces/alias/alias_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/commands"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
-	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
 )
 
 func Test_Alias(t *testing.T) {
@@ -17,7 +17,7 @@ func Test_Alias(t *testing.T) {
 			core.ExecBeforeCmd("scw alias create i command=instance"),
 			core.ExecBeforeCmdArgs([]string{"scw", "alias", "create", "sl", "command=server list"}),
 		),
-		Commands:      namespaces.GetCommands(),
+		Commands:      commands.GetCommands(),
 		Cmd:           "scw i sl -h",
 		EnableAliases: true,
 		Check: core.TestCheckCombine(
@@ -36,7 +36,7 @@ func Test_Alias(t *testing.T) {
 			core.ExecBeforeCmd("scw alias create s command=server"),
 			core.ExecBeforeCmd("scw alias create l command=list"),
 		),
-		Commands:      namespaces.GetCommands(),
+		Commands:      commands.GetCommands(),
 		Cmd:           "scw i s l -h",
 		EnableAliases: true,
 		Check: core.TestCheckCombine(
@@ -53,7 +53,7 @@ func Test_Alias(t *testing.T) {
 		BeforeFunc: core.BeforeFuncCombine(
 			core.ExecBeforeCmd("scw alias create myalias command=iam"),
 		),
-		Commands:      namespaces.GetCommands(),
+		Commands:      commands.GetCommands(),
 		Cmd:           "scw alias list",
 		EnableAliases: true,
 		Check: core.TestCheckCombine(
@@ -71,7 +71,7 @@ func Test_Alias(t *testing.T) {
 		BeforeFunc: core.BeforeFuncCombine(
 			core.ExecBeforeCmd("scw alias create i command=instance"),
 		),
-		Commands:      namespaces.GetCommands(),
+		Commands:      commands.GetCommands(),
 		Cmd:           "scw alias delete i",
 		EnableAliases: true,
 		AfterFunc: core.AfterFuncCombine(
diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_os_test.go b/internal/namespaces/applesilicon/v1alpha1/custom_os_test.go
index 94ffe6a5..033348fc 100644
--- a/internal/namespaces/applesilicon/v1alpha1/custom_os_test.go
+++ b/internal/namespaces/applesilicon/v1alpha1/custom_os_test.go
@@ -3,7 +3,7 @@ package applesilicon_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	applesilicon "github.com/scaleway/scaleway-cli/v2/internal/namespaces/applesilicon/v1alpha1"
 )
 
diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go b/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go
index a358fde4..8a3fe64e 100644
--- a/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go
+++ b/internal/namespaces/applesilicon/v1alpha1/custom_server_ssh_test.go
@@ -3,7 +3,7 @@ package applesilicon_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	applesilicon "github.com/scaleway/scaleway-cli/v2/internal/namespaces/applesilicon/v1alpha1"
 )
 
diff --git a/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go b/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go
index f06abe44..a1e2393a 100644
--- a/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go
+++ b/internal/namespaces/applesilicon/v1alpha1/custom_server_types_test.go
@@ -3,7 +3,7 @@ package applesilicon_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	applesilicon "github.com/scaleway/scaleway-cli/v2/internal/namespaces/applesilicon/v1alpha1"
 )
 
diff --git a/internal/namespaces/baremetal/v1/baremetal_cli_test.go b/internal/namespaces/baremetal/v1/baremetal_cli_test.go
index 63385ed8..270b2772 100644
--- a/internal/namespaces/baremetal/v1/baremetal_cli_test.go
+++ b/internal/namespaces/baremetal/v1/baremetal_cli_test.go
@@ -3,7 +3,7 @@ package baremetal_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/baremetal/v1/custom_offer_test.go b/internal/namespaces/baremetal/v1/custom_offer_test.go
index f233edc9..2876c01f 100644
--- a/internal/namespaces/baremetal/v1/custom_offer_test.go
+++ b/internal/namespaces/baremetal/v1/custom_offer_test.go
@@ -3,7 +3,7 @@ package baremetal_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
 )
 
diff --git a/internal/namespaces/baremetal/v1/custom_server_create_test.go b/internal/namespaces/baremetal/v1/custom_server_create_test.go
index fb926bb4..c5e2f3fd 100644
--- a/internal/namespaces/baremetal/v1/custom_server_create_test.go
+++ b/internal/namespaces/baremetal/v1/custom_server_create_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
 	baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 )
diff --git a/internal/namespaces/baremetal/v1/custom_server_fip_test.go b/internal/namespaces/baremetal/v1/custom_server_fip_test.go
index 07485c5a..14360150 100644
--- a/internal/namespaces/baremetal/v1/custom_server_fip_test.go
+++ b/internal/namespaces/baremetal/v1/custom_server_fip_test.go
@@ -3,7 +3,7 @@ package baremetal_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
 	flexibleip "github.com/scaleway/scaleway-cli/v2/internal/namespaces/flexibleip/v1alpha1"
diff --git a/internal/namespaces/baremetal/v1/custom_server_install_test.go b/internal/namespaces/baremetal/v1/custom_server_install_test.go
index d4879227..67f6fe4b 100644
--- a/internal/namespaces/baremetal/v1/custom_server_install_test.go
+++ b/internal/namespaces/baremetal/v1/custom_server_install_test.go
@@ -3,7 +3,7 @@ package baremetal_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
 	iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 )
diff --git a/internal/namespaces/baremetal/v1/custom_server_test.go b/internal/namespaces/baremetal/v1/custom_server_test.go
index 784e0d70..5d525fdb 100644
--- a/internal/namespaces/baremetal/v1/custom_server_test.go
+++ b/internal/namespaces/baremetal/v1/custom_server_test.go
@@ -3,7 +3,7 @@ package baremetal_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
 	baremetalSDK "github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/baremetal/v1/helpers_test.go b/internal/namespaces/baremetal/v1/helpers_test.go
index 0cd6c896..962b7c1e 100644
--- a/internal/namespaces/baremetal/v1/helpers_test.go
+++ b/internal/namespaces/baremetal/v1/helpers_test.go
@@ -3,7 +3,7 @@ package baremetal_test
 import (
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 // createServerAndWait creates a baremetal instance
diff --git a/internal/namespaces/config/commands_test.go b/internal/namespaces/config/commands_test.go
index 33ffa6af..0695c2a5 100644
--- a/internal/namespaces/config/commands_test.go
+++ b/internal/namespaces/config/commands_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/config"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/require"
diff --git a/internal/namespaces/container/v1beta1/custom_container_test.go b/internal/namespaces/container/v1beta1/custom_container_test.go
index 6b34f4f0..ce771625 100644
--- a/internal/namespaces/container/v1beta1/custom_container_test.go
+++ b/internal/namespaces/container/v1beta1/custom_container_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	container "github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1beta1"
 	containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 )
diff --git a/internal/namespaces/container/v1beta1/custom_deploy_test.go b/internal/namespaces/container/v1beta1/custom_deploy_test.go
index 53ba04bf..b5c185ad 100644
--- a/internal/namespaces/container/v1beta1/custom_deploy_test.go
+++ b/internal/namespaces/container/v1beta1/custom_deploy_test.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	container "github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1beta1"
 	registrycmds "github.com/scaleway/scaleway-cli/v2/internal/namespaces/registry/v1"
 	containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
diff --git a/internal/namespaces/feedback/custom_test.go b/internal/namespaces/feedback/custom_test.go
index da44da18..7605be3d 100644
--- a/internal/namespaces/feedback/custom_test.go
+++ b/internal/namespaces/feedback/custom_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/feedback"
 )
 
diff --git a/internal/namespaces/flexibleip/v1alpha1/custom_ip_test.go b/internal/namespaces/flexibleip/v1alpha1/custom_ip_test.go
index 357b866c..ddf68fce 100644
--- a/internal/namespaces/flexibleip/v1alpha1/custom_ip_test.go
+++ b/internal/namespaces/flexibleip/v1alpha1/custom_ip_test.go
@@ -3,7 +3,7 @@ package flexibleip_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
 	flexibleip "github.com/scaleway/scaleway-cli/v2/internal/namespaces/flexibleip/v1alpha1"
 )
diff --git a/internal/namespaces/function/v1beta1/custom_deploy_test.go b/internal/namespaces/function/v1beta1/custom_deploy_test.go
index 3d4f555c..2d876b7d 100644
--- a/internal/namespaces/function/v1beta1/custom_deploy_test.go
+++ b/internal/namespaces/function/v1beta1/custom_deploy_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	function "github.com/scaleway/scaleway-cli/v2/internal/namespaces/function/v1beta1"
 	functionSDK "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/iam/v1alpha1/custom_policy_test.go b/internal/namespaces/iam/v1alpha1/custom_policy_test.go
index 1132644d..5f1368f7 100644
--- a/internal/namespaces/iam/v1alpha1/custom_policy_test.go
+++ b/internal/namespaces/iam/v1alpha1/custom_policy_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v3"
 	iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 )
diff --git a/internal/namespaces/iam/v1alpha1/custom_rule_test.go b/internal/namespaces/iam/v1alpha1/custom_rule_test.go
index 4997973e..812bdae0 100644
--- a/internal/namespaces/iam/v1alpha1/custom_rule_test.go
+++ b/internal/namespaces/iam/v1alpha1/custom_rule_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v3"
 	iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 )
diff --git a/internal/namespaces/iam/v1alpha1/custom_test.go b/internal/namespaces/iam/v1alpha1/custom_test.go
index 0e75cfa2..a2c22120 100644
--- a/internal/namespaces/iam/v1alpha1/custom_test.go
+++ b/internal/namespaces/iam/v1alpha1/custom_test.go
@@ -5,7 +5,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	iam "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 	iamsdk "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 )
diff --git a/internal/namespaces/iam/v1alpha1/helpers_test.go b/internal/namespaces/iam/v1alpha1/helpers_test.go
index c5b472c5..d32843ef 100644
--- a/internal/namespaces/iam/v1alpha1/helpers_test.go
+++ b/internal/namespaces/iam/v1alpha1/helpers_test.go
@@ -1,6 +1,6 @@
 package iam_test
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func addSSHKey(metaKey string, key string) core.BeforeFunc {
 	return func(ctx *core.BeforeFuncCtx) error {
diff --git a/internal/namespaces/inference/v1beta1/custom_deployment_test.go b/internal/namespaces/inference/v1beta1/custom_deployment_test.go
index 8c880498..862015f8 100644
--- a/internal/namespaces/inference/v1beta1/custom_deployment_test.go
+++ b/internal/namespaces/inference/v1beta1/custom_deployment_test.go
@@ -3,7 +3,7 @@ package inference_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	inference "github.com/scaleway/scaleway-cli/v2/internal/namespaces/inference/v1beta1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 )
diff --git a/internal/namespaces/inference/v1beta1/custom_endpoint_test.go b/internal/namespaces/inference/v1beta1/custom_endpoint_test.go
index 8059c2b1..00d5a43e 100644
--- a/internal/namespaces/inference/v1beta1/custom_endpoint_test.go
+++ b/internal/namespaces/inference/v1beta1/custom_endpoint_test.go
@@ -3,7 +3,7 @@ package inference_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	inference "github.com/scaleway/scaleway-cli/v2/internal/namespaces/inference/v1beta1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 )
diff --git a/internal/namespaces/inference/v1beta1/custom_model_test.go b/internal/namespaces/inference/v1beta1/custom_model_test.go
index 81081898..14c4a2ad 100644
--- a/internal/namespaces/inference/v1beta1/custom_model_test.go
+++ b/internal/namespaces/inference/v1beta1/custom_model_test.go
@@ -3,7 +3,7 @@ package inference_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	inference "github.com/scaleway/scaleway-cli/v2/internal/namespaces/inference/v1beta1"
 )
 
diff --git a/internal/namespaces/inference/v1beta1/helper_test.go b/internal/namespaces/inference/v1beta1/helper_test.go
index c7ecd7bf..3b8b55ce 100644
--- a/internal/namespaces/inference/v1beta1/helper_test.go
+++ b/internal/namespaces/inference/v1beta1/helper_test.go
@@ -1,6 +1,6 @@
 package inference_test
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func CreateDeploymentPublicEndpoint() core.BeforeFunc {
 	return core.ExecStoreBeforeCmd(
diff --git a/internal/namespaces/info/custom_test.go b/internal/namespaces/info/custom_test.go
index ec5402ea..bfc91d97 100644
--- a/internal/namespaces/info/custom_test.go
+++ b/internal/namespaces/info/custom_test.go
@@ -3,7 +3,7 @@ package info_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/info"
 )
 
diff --git a/internal/namespaces/init/custom_init_autocomplete_test.go b/internal/namespaces/init/custom_init_autocomplete_test.go
index d37e396b..8e73c826 100644
--- a/internal/namespaces/init/custom_init_autocomplete_test.go
+++ b/internal/namespaces/init/custom_init_autocomplete_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	initCLI "github.com/scaleway/scaleway-cli/v2/internal/namespaces/init" // alias required to not collide with go init func
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/namespaces/init/custom_init_ssh_test.go b/internal/namespaces/init/custom_init_ssh_test.go
index beb0685f..488ed35f 100644
--- a/internal/namespaces/init/custom_init_ssh_test.go
+++ b/internal/namespaces/init/custom_init_ssh_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	iamcommands "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 	initCLI "github.com/scaleway/scaleway-cli/v2/internal/namespaces/init" // alias required to not collide with go init func
 	iamsdk "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
diff --git a/internal/namespaces/init/init_test.go b/internal/namespaces/init/init_test.go
index 037a6f15..e4b2da4f 100644
--- a/internal/namespaces/init/init_test.go
+++ b/internal/namespaces/init/init_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	initCLI "github.com/scaleway/scaleway-cli/v2/internal/namespaces/init" // alias required to not collide with go init func
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/require"
diff --git a/internal/namespaces/instance/v1/custom_image_test.go b/internal/namespaces/instance/v1/custom_image_test.go
index 9bba13da..598c1581 100644
--- a/internal/namespaces/instance/v1/custom_image_test.go
+++ b/internal/namespaces/instance/v1/custom_image_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/instance/v1/custom_ip_test.go b/internal/namespaces/instance/v1/custom_ip_test.go
index 4b2e28e9..519efeb2 100644
--- a/internal/namespaces/instance/v1/custom_ip_test.go
+++ b/internal/namespaces/instance/v1/custom_ip_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_placement_group_test.go b/internal/namespaces/instance/v1/custom_placement_group_test.go
index 9c4da4c9..8b88c4a4 100644
--- a/internal/namespaces/instance/v1/custom_placement_group_test.go
+++ b/internal/namespaces/instance/v1/custom_placement_group_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_privatenics_test.go b/internal/namespaces/instance/v1/custom_privatenics_test.go
index 97ea9900..38dc56e6 100644
--- a/internal/namespaces/instance/v1/custom_privatenics_test.go
+++ b/internal/namespaces/instance/v1/custom_privatenics_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 )
diff --git a/internal/namespaces/instance/v1/custom_security_group_test.go b/internal/namespaces/instance/v1/custom_security_group_test.go
index 3763ee2d..0fd7c44c 100644
--- a/internal/namespaces/instance/v1/custom_security_group_test.go
+++ b/internal/namespaces/instance/v1/custom_security_group_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_server_action_test.go b/internal/namespaces/instance/v1/custom_server_action_test.go
index 31002419..640c2461 100644
--- a/internal/namespaces/instance/v1/custom_server_action_test.go
+++ b/internal/namespaces/instance/v1/custom_server_action_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
diff --git a/internal/namespaces/instance/v1/custom_server_create_test.go b/internal/namespaces/instance/v1/custom_server_create_test.go
index 4a2d4843..727e477a 100644
--- a/internal/namespaces/instance/v1/custom_server_create_test.go
+++ b/internal/namespaces/instance/v1/custom_server_create_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	block "github.com/scaleway/scaleway-cli/v2/internal/namespaces/block/v1alpha1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
diff --git a/internal/namespaces/instance/v1/custom_server_rdp_test.go b/internal/namespaces/instance/v1/custom_server_rdp_test.go
index 9e9fcc48..6c2e7fa9 100644
--- a/internal/namespaces/instance/v1/custom_server_rdp_test.go
+++ b/internal/namespaces/instance/v1/custom_server_rdp_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	iamCLI "github.com/scaleway/scaleway-cli/v2/internal/namespaces/iam/v1alpha1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
diff --git a/internal/namespaces/instance/v1/custom_server_ssh_test.go b/internal/namespaces/instance/v1/custom_server_ssh_test.go
index 8786c33c..86bc3342 100644
--- a/internal/namespaces/instance/v1/custom_server_ssh_test.go
+++ b/internal/namespaces/instance/v1/custom_server_ssh_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_server_test.go b/internal/namespaces/instance/v1/custom_server_test.go
index b3d86e47..b87aab58 100644
--- a/internal/namespaces/instance/v1/custom_server_test.go
+++ b/internal/namespaces/instance/v1/custom_server_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	blockCli "github.com/scaleway/scaleway-cli/v2/internal/namespaces/block/v1alpha1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
diff --git a/internal/namespaces/instance/v1/custom_server_type_test.go b/internal/namespaces/instance/v1/custom_server_type_test.go
index 6d6f9796..0b3039a3 100644
--- a/internal/namespaces/instance/v1/custom_server_type_test.go
+++ b/internal/namespaces/instance/v1/custom_server_type_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_snapshot_test.go b/internal/namespaces/instance/v1/custom_snapshot_test.go
index f8b93da1..1841ca7f 100644
--- a/internal/namespaces/instance/v1/custom_snapshot_test.go
+++ b/internal/namespaces/instance/v1/custom_snapshot_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
diff --git a/internal/namespaces/instance/v1/custom_ssh_config_test.go b/internal/namespaces/instance/v1/custom_ssh_config_test.go
index bd90d6a5..bf218169 100644
--- a/internal/namespaces/instance/v1/custom_ssh_config_test.go
+++ b/internal/namespaces/instance/v1/custom_ssh_config_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/sshconfig"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
diff --git a/internal/namespaces/instance/v1/custom_ssh_key_test.go b/internal/namespaces/instance/v1/custom_ssh_key_test.go
index 534c9042..e778271d 100644
--- a/internal/namespaces/instance/v1/custom_ssh_key_test.go
+++ b/internal/namespaces/instance/v1/custom_ssh_key_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
diff --git a/internal/namespaces/instance/v1/custom_user_data_test.go b/internal/namespaces/instance/v1/custom_user_data_test.go
index 19dedd78..1c4935ec 100644
--- a/internal/namespaces/instance/v1/custom_user_data_test.go
+++ b/internal/namespaces/instance/v1/custom_user_data_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/custom_volume_type_test.go b/internal/namespaces/instance/v1/custom_volume_type_test.go
index 6855455f..6ec2699c 100644
--- a/internal/namespaces/instance/v1/custom_volume_type_test.go
+++ b/internal/namespaces/instance/v1/custom_volume_type_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/instance/v1/helpers_test.go b/internal/namespaces/instance/v1/helpers_test.go
index 4dd9b6c3..a10731c8 100644
--- a/internal/namespaces/instance/v1/helpers_test.go
+++ b/internal/namespaces/instance/v1/helpers_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 )
diff --git a/internal/namespaces/instance/v1/instance_cli_test.go b/internal/namespaces/instance/v1/instance_cli_test.go
index e4677407..4c9bc68d 100644
--- a/internal/namespaces/instance/v1/instance_cli_test.go
+++ b/internal/namespaces/instance/v1/instance_cli_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/stretchr/testify/assert"
diff --git a/internal/namespaces/instance/v1/ip_test.go b/internal/namespaces/instance/v1/ip_test.go
index 11684ba2..c678919b 100644
--- a/internal/namespaces/instance/v1/ip_test.go
+++ b/internal/namespaces/instance/v1/ip_test.go
@@ -3,7 +3,7 @@ package instance_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 )
 
diff --git a/internal/namespaces/iot/v1/custom_device_test.go b/internal/namespaces/iot/v1/custom_device_test.go
index ce892109..6a0c257c 100644
--- a/internal/namespaces/iot/v1/custom_device_test.go
+++ b/internal/namespaces/iot/v1/custom_device_test.go
@@ -3,7 +3,7 @@ package iot_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/iot/v1"
 )
 
diff --git a/internal/namespaces/iot/v1/custom_network_test.go b/internal/namespaces/iot/v1/custom_network_test.go
index a0b0c6ab..6a990226 100644
--- a/internal/namespaces/iot/v1/custom_network_test.go
+++ b/internal/namespaces/iot/v1/custom_network_test.go
@@ -3,7 +3,7 @@ package iot_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/iot/v1"
 )
 
diff --git a/internal/namespaces/iot/v1/helper_test.go b/internal/namespaces/iot/v1/helper_test.go
index f8be3b03..01b1563c 100644
--- a/internal/namespaces/iot/v1/helper_test.go
+++ b/internal/namespaces/iot/v1/helper_test.go
@@ -1,7 +1,7 @@
 package iot_test
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func createHub() core.BeforeFunc {
diff --git a/internal/namespaces/k8s/v1/custom_cluster_test.go b/internal/namespaces/k8s/v1/custom_cluster_test.go
index adf67550..7d092ac1 100644
--- a/internal/namespaces/k8s/v1/custom_cluster_test.go
+++ b/internal/namespaces/k8s/v1/custom_cluster_test.go
@@ -3,7 +3,7 @@ package k8s_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1"
 )
 
diff --git a/internal/namespaces/k8s/v1/custom_execcredentials_test.go b/internal/namespaces/k8s/v1/custom_execcredentials_test.go
index 70eac98a..217b0423 100644
--- a/internal/namespaces/k8s/v1/custom_execcredentials_test.go
+++ b/internal/namespaces/k8s/v1/custom_execcredentials_test.go
@@ -6,7 +6,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/assert"
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go b/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go
index 952187ac..5fb669c9 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig_get_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/alecthomas/assert"
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1"
 	api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 )
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go b/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go
index c533c67d..954d61f6 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig_install_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/alecthomas/assert"
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1"
 	api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 	k8sSDK "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
diff --git a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go b/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go
index c10b0aa9..4e73862f 100644
--- a/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go
+++ b/internal/namespaces/k8s/v1/custom_kubeconfig_uninstall_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/alecthomas/assert"
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1"
 	api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 	k8sSDK "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
diff --git a/internal/namespaces/k8s/v1/custom_version_test.go b/internal/namespaces/k8s/v1/custom_version_test.go
index d0dd3a32..b8374a4d 100644
--- a/internal/namespaces/k8s/v1/custom_version_test.go
+++ b/internal/namespaces/k8s/v1/custom_version_test.go
@@ -3,7 +3,7 @@ package k8s_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1"
 )
 
diff --git a/internal/namespaces/k8s/v1/helpers_test.go b/internal/namespaces/k8s/v1/helpers_test.go
index 0dd3779e..6de3c159 100644
--- a/internal/namespaces/k8s/v1/helpers_test.go
+++ b/internal/namespaces/k8s/v1/helpers_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	go_api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 	k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 )
diff --git a/internal/namespaces/lb/v1/custom_backend_test.go b/internal/namespaces/lb/v1/custom_backend_test.go
index 6123af3c..0e1c0f5b 100644
--- a/internal/namespaces/lb/v1/custom_backend_test.go
+++ b/internal/namespaces/lb/v1/custom_backend_test.go
@@ -3,7 +3,7 @@ package lb_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1"
 )
diff --git a/internal/namespaces/lb/v1/custom_certificate_test.go b/internal/namespaces/lb/v1/custom_certificate_test.go
index 7c7af78a..d4bc92d6 100644
--- a/internal/namespaces/lb/v1/custom_certificate_test.go
+++ b/internal/namespaces/lb/v1/custom_certificate_test.go
@@ -3,7 +3,7 @@ package lb_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1"
 )
 
diff --git a/internal/namespaces/lb/v1/custom_frontend_test.go b/internal/namespaces/lb/v1/custom_frontend_test.go
index 7e1a0f6f..d6904132 100644
--- a/internal/namespaces/lb/v1/custom_frontend_test.go
+++ b/internal/namespaces/lb/v1/custom_frontend_test.go
@@ -3,7 +3,7 @@ package lb_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1"
 )
diff --git a/internal/namespaces/lb/v1/custom_lb_test.go b/internal/namespaces/lb/v1/custom_lb_test.go
index f93a5875..808adbbe 100644
--- a/internal/namespaces/lb/v1/custom_lb_test.go
+++ b/internal/namespaces/lb/v1/custom_lb_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1"
diff --git a/internal/namespaces/lb/v1/custom_private_network_test.go b/internal/namespaces/lb/v1/custom_private_network_test.go
index 4732450e..315392df 100644
--- a/internal/namespaces/lb/v1/custom_private_network_test.go
+++ b/internal/namespaces/lb/v1/custom_private_network_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 )
diff --git a/internal/namespaces/lb/v1/helper_test.go b/internal/namespaces/lb/v1/helper_test.go
index 9b056255..01fac964 100644
--- a/internal/namespaces/lb/v1/helper_test.go
+++ b/internal/namespaces/lb/v1/helper_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/ghodss/yaml"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	go_api "github.com/scaleway/scaleway-cli/v2/internal/namespaces/k8s/v1/types"
 	"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/lb/v1"
diff --git a/internal/namespaces/marketplace/v2/marketplace_cli_test.go b/internal/namespaces/marketplace/v2/marketplace_cli_test.go
index 336f57d3..33045570 100644
--- a/internal/namespaces/marketplace/v2/marketplace_cli_test.go
+++ b/internal/namespaces/marketplace/v2/marketplace_cli_test.go
@@ -3,7 +3,7 @@ package marketplace_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/marketplace/v2"
 )
 
diff --git a/internal/namespaces/mnq/v1beta1/custom_nats_test.go b/internal/namespaces/mnq/v1beta1/custom_nats_test.go
index ece6dd69..4b85bf29 100644
--- a/internal/namespaces/mnq/v1beta1/custom_nats_test.go
+++ b/internal/namespaces/mnq/v1beta1/custom_nats_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	mnq "github.com/scaleway/scaleway-cli/v2/internal/namespaces/mnq/v1beta1"
 )
 
diff --git a/internal/namespaces/mnq/v1beta1/helpers_test.go b/internal/namespaces/mnq/v1beta1/helpers_test.go
index 431f82ff..891839b3 100644
--- a/internal/namespaces/mnq/v1beta1/helpers_test.go
+++ b/internal/namespaces/mnq/v1beta1/helpers_test.go
@@ -1,7 +1,7 @@
 package mnq_test
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func createNATSAccount(metaKey string) core.BeforeFunc {
diff --git a/internal/namespaces/object/v1/custom_bucket_test.go b/internal/namespaces/object/v1/custom_bucket_test.go
index c5e1d1a5..f36bfa52 100644
--- a/internal/namespaces/object/v1/custom_bucket_test.go
+++ b/internal/namespaces/object/v1/custom_bucket_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/alecthomas/assert"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/object/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/object/v1/custom_config_get_test.go b/internal/namespaces/object/v1/custom_config_get_test.go
index 68274ade..84fef227 100644
--- a/internal/namespaces/object/v1/custom_config_get_test.go
+++ b/internal/namespaces/object/v1/custom_config_get_test.go
@@ -3,7 +3,7 @@ package object_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/object/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/require"
diff --git a/internal/namespaces/object/v1/custom_config_install_test.go b/internal/namespaces/object/v1/custom_config_install_test.go
index f6f6e407..f4a59816 100644
--- a/internal/namespaces/object/v1/custom_config_install_test.go
+++ b/internal/namespaces/object/v1/custom_config_install_test.go
@@ -4,7 +4,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/object/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/stretchr/testify/assert"
diff --git a/internal/namespaces/rdb/v1/custom_acl_test.go b/internal/namespaces/rdb/v1/custom_acl_test.go
index 7d5c0c36..4906b011 100644
--- a/internal/namespaces/rdb/v1/custom_acl_test.go
+++ b/internal/namespaces/rdb/v1/custom_acl_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 )
 
diff --git a/internal/namespaces/rdb/v1/custom_backup_test.go b/internal/namespaces/rdb/v1/custom_backup_test.go
index d1e624ab..a2441c0e 100644
--- a/internal/namespaces/rdb/v1/custom_backup_test.go
+++ b/internal/namespaces/rdb/v1/custom_backup_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/rdb/v1/custom_endpoint_test.go b/internal/namespaces/rdb/v1/custom_endpoint_test.go
index b47b7dc8..6a0dfb25 100644
--- a/internal/namespaces/rdb/v1/custom_endpoint_test.go
+++ b/internal/namespaces/rdb/v1/custom_endpoint_test.go
@@ -3,7 +3,7 @@ package rdb_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 	"github.com/scaleway/scaleway-sdk-go/api/ipam/v1"
diff --git a/internal/namespaces/rdb/v1/custom_engine_settings_test.go b/internal/namespaces/rdb/v1/custom_engine_settings_test.go
index 6f976b4e..eef57dbb 100644
--- a/internal/namespaces/rdb/v1/custom_engine_settings_test.go
+++ b/internal/namespaces/rdb/v1/custom_engine_settings_test.go
@@ -3,7 +3,7 @@ package rdb_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 )
 
diff --git a/internal/namespaces/rdb/v1/custom_engine_test.go b/internal/namespaces/rdb/v1/custom_engine_test.go
index 10315185..c4f47ae4 100644
--- a/internal/namespaces/rdb/v1/custom_engine_test.go
+++ b/internal/namespaces/rdb/v1/custom_engine_test.go
@@ -3,7 +3,7 @@ package rdb_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 )
 
diff --git a/internal/namespaces/rdb/v1/custom_instance_test.go b/internal/namespaces/rdb/v1/custom_instance_test.go
index 82009e0f..e6c1d37c 100644
--- a/internal/namespaces/rdb/v1/custom_instance_test.go
+++ b/internal/namespaces/rdb/v1/custom_instance_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 	rdbSDK "github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
diff --git a/internal/namespaces/rdb/v1/custom_url_test.go b/internal/namespaces/rdb/v1/custom_url_test.go
index 5c2dbf7d..23ab79ec 100644
--- a/internal/namespaces/rdb/v1/custom_url_test.go
+++ b/internal/namespaces/rdb/v1/custom_url_test.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/internal/namespaces/rdb/v1/custom_user_test.go b/internal/namespaces/rdb/v1/custom_user_test.go
index ff301850..6c839e35 100644
--- a/internal/namespaces/rdb/v1/custom_user_test.go
+++ b/internal/namespaces/rdb/v1/custom_user_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 )
 
diff --git a/internal/namespaces/rdb/v1/helper_test.go b/internal/namespaces/rdb/v1/helper_test.go
index f4355454..2cb037fb 100644
--- a/internal/namespaces/rdb/v1/helper_test.go
+++ b/internal/namespaces/rdb/v1/helper_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/vpc/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
diff --git a/internal/namespaces/redis/v1/custom_cluster_test.go b/internal/namespaces/redis/v1/custom_cluster_test.go
index 8c591a93..062257d5 100644
--- a/internal/namespaces/redis/v1/custom_cluster_test.go
+++ b/internal/namespaces/redis/v1/custom_cluster_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/redis/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 	redisSDK "github.com/scaleway/scaleway-sdk-go/api/redis/v1"
diff --git a/internal/namespaces/registry/v1/custom_docker_helper_test.go b/internal/namespaces/registry/v1/custom_docker_helper_test.go
index 6ba503e9..242fb183 100644
--- a/internal/namespaces/registry/v1/custom_docker_helper_test.go
+++ b/internal/namespaces/registry/v1/custom_docker_helper_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/registry/v1"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/namespaces/registry/v1/custom_image_test.go b/internal/namespaces/registry/v1/custom_image_test.go
index 82b12a45..297f82e6 100644
--- a/internal/namespaces/registry/v1/custom_image_test.go
+++ b/internal/namespaces/registry/v1/custom_image_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/registry/v1"
 	registrySDK "github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 )
diff --git a/internal/namespaces/registry/v1/custom_login_test.go b/internal/namespaces/registry/v1/custom_login_test.go
index 96d3280e..bcef8393 100644
--- a/internal/namespaces/registry/v1/custom_login_test.go
+++ b/internal/namespaces/registry/v1/custom_login_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/registry/v1"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/namespaces/registry/v1/custom_logout_test.go b/internal/namespaces/registry/v1/custom_logout_test.go
index a2dc5d30..85094e7a 100644
--- a/internal/namespaces/registry/v1/custom_logout_test.go
+++ b/internal/namespaces/registry/v1/custom_logout_test.go
@@ -3,7 +3,7 @@ package registry_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/registry/v1"
 )
 
diff --git a/internal/namespaces/secret/v1beta1/custom_secret_version_test.go b/internal/namespaces/secret/v1beta1/custom_secret_version_test.go
index 815137f5..9555cb25 100644
--- a/internal/namespaces/secret/v1beta1/custom_secret_version_test.go
+++ b/internal/namespaces/secret/v1beta1/custom_secret_version_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/alecthomas/assert"
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	secret "github.com/scaleway/scaleway-cli/v2/internal/namespaces/secret/v1beta1"
 )
 
diff --git a/internal/namespaces/secret/v1beta1/helper_test.go b/internal/namespaces/secret/v1beta1/helper_test.go
index d4f371dc..37e9b8b1 100644
--- a/internal/namespaces/secret/v1beta1/helper_test.go
+++ b/internal/namespaces/secret/v1beta1/helper_test.go
@@ -1,7 +1,7 @@
 package secret_test
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func createSecret(name string) core.BeforeFunc {
diff --git a/internal/namespaces/test/custom/custom_cli.go b/internal/namespaces/test/custom/custom_cli.go
index 1d84c55d..2ea772ae 100644
--- a/internal/namespaces/test/custom/custom_cli.go
+++ b/internal/namespaces/test/custom/custom_cli.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCustomCommands() *core.Commands {
diff --git a/internal/namespaces/test/custom/custom_cli_test.go b/internal/namespaces/test/custom/custom_cli_test.go
index d4f97022..18534fee 100644
--- a/internal/namespaces/test/custom/custom_cli_test.go
+++ b/internal/namespaces/test/custom/custom_cli_test.go
@@ -3,7 +3,7 @@ package test_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	test "github.com/scaleway/scaleway-cli/v2/internal/namespaces/test/custom"
 )
 
diff --git a/internal/namespaces/test/v1/custom.go b/internal/namespaces/test/v1/custom.go
index ccc59a75..0051cd03 100644
--- a/internal/namespaces/test/v1/custom.go
+++ b/internal/namespaces/test/v1/custom.go
@@ -1,7 +1,7 @@
 package test
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func GetCommands() *core.Commands {
diff --git a/internal/namespaces/test/v1/test_cli.go b/internal/namespaces/test/v1/test_cli.go
index 2a2e2237..75a58338 100644
--- a/internal/namespaces/test/v1/test_cli.go
+++ b/internal/namespaces/test/v1/test_cli.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"reflect"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/test/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/internal/namespaces/vpc/v2/custom_private_network_test.go b/internal/namespaces/vpc/v2/custom_private_network_test.go
index 2d83e086..05fad90d 100644
--- a/internal/namespaces/vpc/v2/custom_private_network_test.go
+++ b/internal/namespaces/vpc/v2/custom_private_network_test.go
@@ -3,7 +3,7 @@ package vpc_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/lb/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/rdb/v1"
diff --git a/internal/namespaces/vpc/v2/helper_test.go b/internal/namespaces/vpc/v2/helper_test.go
index 2a1dec5c..2a039019 100644
--- a/internal/namespaces/vpc/v2/helper_test.go
+++ b/internal/namespaces/vpc/v2/helper_test.go
@@ -1,7 +1,7 @@
 package vpc_test
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 )
 
 func createInstance() core.BeforeFunc {
diff --git a/internal/namespaces/vpcgw/v1/custom_gateway_network_test.go b/internal/namespaces/vpcgw/v1/custom_gateway_network_test.go
index da2ac77e..039aee80 100644
--- a/internal/namespaces/vpcgw/v1/custom_gateway_network_test.go
+++ b/internal/namespaces/vpcgw/v1/custom_gateway_network_test.go
@@ -3,7 +3,7 @@ package vpcgw_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpcgw/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
diff --git a/internal/namespaces/vpcgw/v1/custom_gateway_test.go b/internal/namespaces/vpcgw/v1/custom_gateway_test.go
index 545c207d..dabf0a36 100644
--- a/internal/namespaces/vpcgw/v1/custom_gateway_test.go
+++ b/internal/namespaces/vpcgw/v1/custom_gateway_test.go
@@ -3,7 +3,7 @@ package vpcgw_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpcgw/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
diff --git a/internal/namespaces/vpcgw/v1/custom_gateway_type_test.go b/internal/namespaces/vpcgw/v1/custom_gateway_type_test.go
index b304bbab..74ea4316 100644
--- a/internal/namespaces/vpcgw/v1/custom_gateway_type_test.go
+++ b/internal/namespaces/vpcgw/v1/custom_gateway_type_test.go
@@ -3,7 +3,7 @@ package vpcgw_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpcgw/v1"
 )
 
diff --git a/internal/namespaces/webhosting/v1alpha1/custom_offer_test.go b/internal/namespaces/webhosting/v1alpha1/custom_offer_test.go
index 7d73a1c7..919a36d6 100644
--- a/internal/namespaces/webhosting/v1alpha1/custom_offer_test.go
+++ b/internal/namespaces/webhosting/v1alpha1/custom_offer_test.go
@@ -3,7 +3,7 @@ package webhosting_test
 import (
 	"testing"
 
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	webhosting "github.com/scaleway/scaleway-cli/v2/internal/namespaces/webhosting/v1alpha1"
 )
 
diff --git a/internal/testhelpers/helpers_vpc.go b/internal/testhelpers/helpers_vpc.go
index ac207189..84551875 100644
--- a/internal/testhelpers/helpers_vpc.go
+++ b/internal/testhelpers/helpers_vpc.go
@@ -1,6 +1,6 @@
 package testhelpers
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import "github.com/scaleway/scaleway-cli/v2/core"
 
 func CreatePN() core.BeforeFunc {
 	return core.ExecStoreBeforeCmd(
diff --git a/internal/testhelpers/helpers_vpcgw.go b/internal/testhelpers/helpers_vpcgw.go
index c51a480f..d0d8b9fe 100644
--- a/internal/testhelpers/helpers_vpcgw.go
+++ b/internal/testhelpers/helpers_vpcgw.go
@@ -1,7 +1,7 @@
 package testhelpers
 
 import (
-	"github.com/scaleway/scaleway-cli/v2/internal/core"
+	"github.com/scaleway/scaleway-cli/v2/core"
 	"github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
 )