diff --git a/client/get.go b/internal/client/get.go
similarity index 100%
rename from client/get.go
rename to internal/client/get.go
diff --git a/client/get_test.go b/internal/client/get_test.go
similarity index 100%
rename from client/get_test.go
rename to internal/client/get_test.go
diff --git a/client/route_add.go b/internal/client/route_add.go
similarity index 100%
rename from client/route_add.go
rename to internal/client/route_add.go
diff --git a/client/route_add_test.go b/internal/client/route_add_test.go
similarity index 100%
rename from client/route_add_test.go
rename to internal/client/route_add_test.go
diff --git a/client/set.go b/internal/client/set.go
similarity index 100%
rename from client/set.go
rename to internal/client/set.go
diff --git a/client/set_test.go b/internal/client/set_test.go
similarity index 98%
rename from client/set_test.go
rename to internal/client/set_test.go
index c99afe8..8c4a39a 100644
--- a/client/set_test.go
+++ b/internal/client/set_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/BBVA/kapow/client"
+	"github.com/BBVA/kapow/internal/client"
 
 	gock "gopkg.in/h2non/gock.v1"
 )
diff --git a/command/get.go b/internal/cmd/get.go
similarity index 94%
rename from command/get.go
rename to internal/cmd/get.go
index a480e2d..594c523 100644
--- a/command/get.go
+++ b/internal/cmd/get.go
@@ -1,4 +1,4 @@
-package command
+package cmd
 
 import (
 	"fmt"
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/BBVA/kapow/client"
+	"github.com/BBVA/kapow/internal/client"
 )
 
 // GetCmd is the command line interface for get kapow data operation
diff --git a/command/route.go b/internal/cmd/route.go
similarity index 99%
rename from command/route.go
rename to internal/cmd/route.go
index 11b1b26..351b40f 100644
--- a/command/route.go
+++ b/internal/cmd/route.go
@@ -1,4 +1,4 @@
-package command
+package cmd
 
 import (
 	"fmt"
diff --git a/command/server.go b/internal/cmd/server.go
similarity index 98%
rename from command/server.go
rename to internal/cmd/server.go
index 61f8061..4f7921f 100644
--- a/command/server.go
+++ b/internal/cmd/server.go
@@ -1,4 +1,4 @@
-package command
+package cmd
 
 import (
 	"errors"
diff --git a/command/set.go b/internal/cmd/set.go
similarity index 97%
rename from command/set.go
rename to internal/cmd/set.go
index 0bade4f..4485815 100644
--- a/command/set.go
+++ b/internal/cmd/set.go
@@ -1,4 +1,4 @@
-package command
+package cmd
 
 import (
 	"fmt"
diff --git a/command/validations.go b/internal/cmd/validations.go
similarity index 96%
rename from command/validations.go
rename to internal/cmd/validations.go
index 353cc52..9e855fb 100644
--- a/command/validations.go
+++ b/internal/cmd/validations.go
@@ -1,4 +1,4 @@
-package command
+package cmd
 
 import (
 	"errors"
diff --git a/main.go b/main.go
index eea713f..3506d3e 100644
--- a/main.go
+++ b/main.go
@@ -6,16 +6,16 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/BBVA/kapow/command"
+	"github.com/BBVA/kapow/internal/cmd"
 )
 
 func main() {
 	var kapowCmd = &cobra.Command{Use: "kapow [action]"}
 
-	kapowCmd.AddCommand(command.ServerCmd)
-	kapowCmd.AddCommand(command.GetCmd)
-	kapowCmd.AddCommand(command.SetCmd)
-	kapowCmd.AddCommand(command.RouteCmd)
+	kapowCmd.AddCommand(cmd.ServerCmd)
+	kapowCmd.AddCommand(cmd.GetCmd)
+	kapowCmd.AddCommand(cmd.SetCmd)
+	kapowCmd.AddCommand(cmd.RouteCmd)
 
 	err := kapowCmd.Execute()
 	if err != nil {