diff --git a/README.md b/README.md
index 4861989..1909dfc 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,12 @@ import (
 	"fmt"
 	"log"
 
-	decort "github.com/rudecs/decort-sdk"
-	"github.com/rudecs/decort-sdk/kvmx86"
+	"github.com/rudecs/decort-sdk/config"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/kvmx86"
 )
 
 func main() {
-	cfg := decort.Config{
+	cfg := config.Config{
 		AppID:     "<APPID>",
 		AppSecret: "<APPSECRET>",
 		SSOURL:    "https://sso.digitalenergy.online",
diff --git a/account.go b/account.go
index c6bce94..b14012b 100644
--- a/account.go
+++ b/account.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/account"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/account"
 )
 
 func (dc *decortClient) Account() *account.Account {
diff --git a/client.go b/client.go
index e9aaf9d..cdc97ce 100644
--- a/client.go
+++ b/client.go
@@ -1,13 +1,15 @@
-package client
+package decortsdk
 
 import (
 	"context"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 
 	"github.com/google/go-querystring/query"
+	"github.com/rudecs/decort-sdk/config"
+	"github.com/rudecs/decort-sdk/internal/client"
 )
 
 type decortClient struct {
@@ -15,10 +17,10 @@ type decortClient struct {
 	client    *http.Client
 }
 
-func New(config Config) *decortClient {
+func New(cfg config.Config) *decortClient {
 	return &decortClient{
-		decortUrl: config.DecortUrl,
-		client:    newHttpClient(config),
+		decortUrl: cfg.DecortURL,
+		client:    client.NewHttpClient(cfg),
 	}
 }
 
@@ -37,7 +39,7 @@ func (dc *decortClient) DecortApiCall(ctx context.Context, method, url string, p
 	}
 	defer resp.Body.Close()
 
-	respBytes, err := ioutil.ReadAll(resp.Body)
+	respBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
diff --git a/compute.go b/compute.go
index 3106ccb..2d49770 100644
--- a/compute.go
+++ b/compute.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/compute"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/compute"
 )
 
 func (dc *decortClient) Compute() *compute.Compute {
diff --git a/computeci.go b/computeci.go
index f09c7cf..f690fe2 100644
--- a/computeci.go
+++ b/computeci.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/computeci"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/computeci"
 )
 
 func (dc *decortClient) ComputeCI() *computeci.ComputeCI {
diff --git a/config.go b/config/config.go
similarity index 86%
rename from config.go
rename to config/config.go
index 8f6abcc..9efdf42 100644
--- a/config.go
+++ b/config/config.go
@@ -1,4 +1,4 @@
-package client
+package config
 
 type Config struct {
 	AppID         string
diff --git a/disks.go b/disks.go
index 6589640..99a80c2 100644
--- a/disks.go
+++ b/disks.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/disks"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/disks"
 )
 
 func (dc *decortClient) Disks() *disks.Disks {
diff --git a/extnet.go b/extnet.go
index 6e3e787..c73d031 100644
--- a/extnet.go
+++ b/extnet.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/extnet"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/extnet"
 )
 
 func (dc *decortClient) Extnet() *extnet.Extnet {
diff --git a/flipgroup.go b/flipgroup.go
index 15befce..16b8591 100644
--- a/flipgroup.go
+++ b/flipgroup.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/flipgroup"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/flipgroup"
 )
 
 func (dc *decortClient) FlipGroup() *flipgroup.FlipGroup {
diff --git a/image.go b/image.go
index 8ae4d54..e4294af 100644
--- a/image.go
+++ b/image.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/image"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/image"
 )
 
 func (dc *decortClient) Image() *image.Image {
diff --git a/http-client.go b/internal/client/http-client.go
similarity index 52%
rename from http-client.go
rename to internal/client/http-client.go
index 84ba388..3404aaa 100644
--- a/http-client.go
+++ b/internal/client/http-client.go
@@ -4,19 +4,21 @@ import (
 	"crypto/tls"
 	"net/http"
 	"time"
+
+	"github.com/rudecs/decort-sdk/config"
 )
 
-func newHttpClient(config Config) *http.Client {
+func NewHttpClient(cfg config.Config) *http.Client {
 
-	transCfg := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: config.SSLSkipVerify}}
+	transCfg := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: cfg.SSLSkipVerify}}
 
 	return &http.Client{
 		Transport: &transport{
 			base:         transCfg,
-			retries:      config.Retries,
-			clientId:     config.AppId,
-			clientSecret: config.AppSecret,
-			ssoUrl:       config.SSOUrl,
+			retries:      cfg.Retries,
+			clientId:     cfg.AppID,
+			clientSecret: cfg.AppSecret,
+			ssoUrl:       cfg.SSOURL,
 			//TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 		},
 
diff --git a/transport.go b/internal/client/transport.go
similarity index 80%
rename from transport.go
rename to internal/client/transport.go
index 5186788..cad5a26 100644
--- a/transport.go
+++ b/internal/client/transport.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -32,12 +31,13 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
 			return nil, fmt.Errorf("cannot get token: %v", err)
 		}
 
+		tokenBytes, _ := ioutil.ReadAll(resp.Body)
+		resp.Body.Close()
+
 		if resp.StatusCode != 200 {
-			return nil, fmt.Errorf("cannot get token: %v", err)
+			return nil, fmt.Errorf("cannot get token: %s", tokenBytes)
 		}
 
-		tokenBytes, _ := ioutil.ReadAll(resp.Body)
-		resp.Body.Close()
 		token := string(tokenBytes)
 
 		t.token = token
@@ -48,8 +48,10 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req.Header.Add("Authorization", "bearer "+t.token)
 	req.Header.Set("Accept", "application/json")
 
+	var resp *http.Response
+	var err error
 	for i := uint64(0); i < t.retries; i++ {
-		resp, err := t.base.RoundTrip(req)
+		resp, err = t.base.RoundTrip(req)
 		if err == nil {
 			if resp.StatusCode == 200 {
 				return resp, nil
@@ -58,8 +60,8 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
 			err = fmt.Errorf("%s", respBytes)
 			resp.Body.Close()
 		}
-		fmt.Println(err)
+		//logrus.Errorf("Could not execute request: %v. Retrying %d/%d", err, i+1, t.retries)
 		time.Sleep(time.Second * 5)
 	}
-	return nil, errors.New("number of retries exceeded")
+	return nil, fmt.Errorf("could not execute request: %v", err)
 }
diff --git a/k8ci.go b/k8ci.go
index 8a5075a..19fe875 100644
--- a/k8ci.go
+++ b/k8ci.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/k8ci"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/k8ci"
 )
 
 func (dc *decortClient) K8CI() *k8ci.K8CI {
diff --git a/k8s.go b/k8s.go
index d4fff95..4e9399e 100644
--- a/k8s.go
+++ b/k8s.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/k8s"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/k8s"
 )
 
 func (dc *decortClient) K8S() *k8s.K8S {
diff --git a/kvmppc.go b/kvmppc.go
index 0731e01..d4feb61 100644
--- a/kvmppc.go
+++ b/kvmppc.go
@@ -1,6 +1,6 @@
-package client
+package decortsdk
 
-import "github.com/rudecs/decort-sdk/kvmppc"
+import "github.com/rudecs/decort-sdk/pkg/cloudapi/kvmppc"
 
 func (dc *decortClient) KVMPPC() *kvmppc.KVMPPC {
 	return kvmppc.New(dc)
diff --git a/kvmx86.go b/kvmx86.go
index 32d3333..a634d69 100644
--- a/kvmx86.go
+++ b/kvmx86.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/kvmx86"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/kvmx86"
 )
 
 func (dc *decortClient) KVMX86() *kvmx86.KVMX86 {
diff --git a/lb.go b/lb.go
index e20674b..feef926 100644
--- a/lb.go
+++ b/lb.go
@@ -1,6 +1,6 @@
-package client
+package decortsdk
 
-import "github.com/rudecs/decort-sdk/lb"
+import "github.com/rudecs/decort-sdk/pkg/cloudapi/lb"
 
 func (dc *decortClient) LB() *lb.LB {
 	return lb.New(dc)
diff --git a/locatons.go b/locatons.go
index 4bd232e..87a0bcc 100644
--- a/locatons.go
+++ b/locatons.go
@@ -1,6 +1,6 @@
-package client
+package decortsdk
 
-import "github.com/rudecs/decort-sdk/locations"
+import "github.com/rudecs/decort-sdk/pkg/cloudapi/locations"
 
 func (dc *decortClient) Locations() *locations.Locations {
 	return locations.New(dc)
diff --git a/account/account.go b/pkg/cloudapi/account/account.go
similarity index 100%
rename from account/account.go
rename to pkg/cloudapi/account/account.go
diff --git a/account/add_user.go b/pkg/cloudapi/account/add_user.go
similarity index 100%
rename from account/add_user.go
rename to pkg/cloudapi/account/add_user.go
diff --git a/account/audits.go b/pkg/cloudapi/account/audits.go
similarity index 100%
rename from account/audits.go
rename to pkg/cloudapi/account/audits.go
diff --git a/account/create.go b/pkg/cloudapi/account/create.go
similarity index 100%
rename from account/create.go
rename to pkg/cloudapi/account/create.go
diff --git a/account/delete.go b/pkg/cloudapi/account/delete.go
similarity index 100%
rename from account/delete.go
rename to pkg/cloudapi/account/delete.go
diff --git a/account/delete_user.go b/pkg/cloudapi/account/delete_user.go
similarity index 100%
rename from account/delete_user.go
rename to pkg/cloudapi/account/delete_user.go
diff --git a/account/disable_enable.go b/pkg/cloudapi/account/disable_enable.go
similarity index 100%
rename from account/disable_enable.go
rename to pkg/cloudapi/account/disable_enable.go
diff --git a/account/get.go b/pkg/cloudapi/account/get.go
similarity index 100%
rename from account/get.go
rename to pkg/cloudapi/account/get.go
diff --git a/account/get_consumed_account_units.go b/pkg/cloudapi/account/get_consumed_account_units.go
similarity index 100%
rename from account/get_consumed_account_units.go
rename to pkg/cloudapi/account/get_consumed_account_units.go
diff --git a/account/get_consumed_cloud_units_by_type.go b/pkg/cloudapi/account/get_consumed_cloud_units_by_type.go
similarity index 100%
rename from account/get_consumed_cloud_units_by_type.go
rename to pkg/cloudapi/account/get_consumed_cloud_units_by_type.go
diff --git a/account/get_consumption.go b/pkg/cloudapi/account/get_consumption.go
similarity index 100%
rename from account/get_consumption.go
rename to pkg/cloudapi/account/get_consumption.go
diff --git a/account/get_reserved_account_units.go b/pkg/cloudapi/account/get_reserved_account_units.go
similarity index 100%
rename from account/get_reserved_account_units.go
rename to pkg/cloudapi/account/get_reserved_account_units.go
diff --git a/account/list.go b/pkg/cloudapi/account/list.go
similarity index 100%
rename from account/list.go
rename to pkg/cloudapi/account/list.go
diff --git a/account/list_computes.go b/pkg/cloudapi/account/list_computes.go
similarity index 100%
rename from account/list_computes.go
rename to pkg/cloudapi/account/list_computes.go
diff --git a/account/list_deleted.go b/pkg/cloudapi/account/list_deleted.go
similarity index 100%
rename from account/list_deleted.go
rename to pkg/cloudapi/account/list_deleted.go
diff --git a/account/list_disks.go b/pkg/cloudapi/account/list_disks.go
similarity index 100%
rename from account/list_disks.go
rename to pkg/cloudapi/account/list_disks.go
diff --git a/account/list_flipgroups.go b/pkg/cloudapi/account/list_flipgroups.go
similarity index 100%
rename from account/list_flipgroups.go
rename to pkg/cloudapi/account/list_flipgroups.go
diff --git a/account/list_rg.go b/pkg/cloudapi/account/list_rg.go
similarity index 100%
rename from account/list_rg.go
rename to pkg/cloudapi/account/list_rg.go
diff --git a/account/list_templates.go b/pkg/cloudapi/account/list_templates.go
similarity index 100%
rename from account/list_templates.go
rename to pkg/cloudapi/account/list_templates.go
diff --git a/account/list_vins.go b/pkg/cloudapi/account/list_vins.go
similarity index 100%
rename from account/list_vins.go
rename to pkg/cloudapi/account/list_vins.go
diff --git a/account/models.go b/pkg/cloudapi/account/models.go
similarity index 100%
rename from account/models.go
rename to pkg/cloudapi/account/models.go
diff --git a/account/restore.go b/pkg/cloudapi/account/restore.go
similarity index 100%
rename from account/restore.go
rename to pkg/cloudapi/account/restore.go
diff --git a/account/update.go b/pkg/cloudapi/account/update.go
similarity index 100%
rename from account/update.go
rename to pkg/cloudapi/account/update.go
diff --git a/account/update_user.go b/pkg/cloudapi/account/update_user.go
similarity index 100%
rename from account/update_user.go
rename to pkg/cloudapi/account/update_user.go
diff --git a/bservice/bservice.go b/pkg/cloudapi/bservice/bservice.go
similarity index 100%
rename from bservice/bservice.go
rename to pkg/cloudapi/bservice/bservice.go
diff --git a/bservice/create.go b/pkg/cloudapi/bservice/create.go
similarity index 100%
rename from bservice/create.go
rename to pkg/cloudapi/bservice/create.go
diff --git a/bservice/delete.go b/pkg/cloudapi/bservice/delete.go
similarity index 100%
rename from bservice/delete.go
rename to pkg/cloudapi/bservice/delete.go
diff --git a/bservice/disable.go b/pkg/cloudapi/bservice/disable.go
similarity index 100%
rename from bservice/disable.go
rename to pkg/cloudapi/bservice/disable.go
diff --git a/bservice/enable.go b/pkg/cloudapi/bservice/enable.go
similarity index 100%
rename from bservice/enable.go
rename to pkg/cloudapi/bservice/enable.go
diff --git a/bservice/get.go b/pkg/cloudapi/bservice/get.go
similarity index 100%
rename from bservice/get.go
rename to pkg/cloudapi/bservice/get.go
diff --git a/bservice/group_add.go b/pkg/cloudapi/bservice/group_add.go
similarity index 100%
rename from bservice/group_add.go
rename to pkg/cloudapi/bservice/group_add.go
diff --git a/bservice/group_compute_remove.go b/pkg/cloudapi/bservice/group_compute_remove.go
similarity index 100%
rename from bservice/group_compute_remove.go
rename to pkg/cloudapi/bservice/group_compute_remove.go
diff --git a/bservice/group_get.go b/pkg/cloudapi/bservice/group_get.go
similarity index 100%
rename from bservice/group_get.go
rename to pkg/cloudapi/bservice/group_get.go
diff --git a/bservice/group_parent_add.go b/pkg/cloudapi/bservice/group_parent_add.go
similarity index 100%
rename from bservice/group_parent_add.go
rename to pkg/cloudapi/bservice/group_parent_add.go
diff --git a/bservice/group_parent_remove.go b/pkg/cloudapi/bservice/group_parent_remove.go
similarity index 100%
rename from bservice/group_parent_remove.go
rename to pkg/cloudapi/bservice/group_parent_remove.go
diff --git a/bservice/group_remove.go b/pkg/cloudapi/bservice/group_remove.go
similarity index 100%
rename from bservice/group_remove.go
rename to pkg/cloudapi/bservice/group_remove.go
diff --git a/bservice/group_resize.go b/pkg/cloudapi/bservice/group_resize.go
similarity index 100%
rename from bservice/group_resize.go
rename to pkg/cloudapi/bservice/group_resize.go
diff --git a/bservice/group_start.go b/pkg/cloudapi/bservice/group_start.go
similarity index 100%
rename from bservice/group_start.go
rename to pkg/cloudapi/bservice/group_start.go
diff --git a/bservice/group_stop.go b/pkg/cloudapi/bservice/group_stop.go
similarity index 100%
rename from bservice/group_stop.go
rename to pkg/cloudapi/bservice/group_stop.go
diff --git a/bservice/group_update.go b/pkg/cloudapi/bservice/group_update.go
similarity index 100%
rename from bservice/group_update.go
rename to pkg/cloudapi/bservice/group_update.go
diff --git a/bservice/group_update_extnet.go b/pkg/cloudapi/bservice/group_update_extnet.go
similarity index 100%
rename from bservice/group_update_extnet.go
rename to pkg/cloudapi/bservice/group_update_extnet.go
diff --git a/bservice/group_update_vins.go b/pkg/cloudapi/bservice/group_update_vins.go
similarity index 100%
rename from bservice/group_update_vins.go
rename to pkg/cloudapi/bservice/group_update_vins.go
diff --git a/bservice/list.go b/pkg/cloudapi/bservice/list.go
similarity index 100%
rename from bservice/list.go
rename to pkg/cloudapi/bservice/list.go
diff --git a/bservice/models.go b/pkg/cloudapi/bservice/models.go
similarity index 100%
rename from bservice/models.go
rename to pkg/cloudapi/bservice/models.go
diff --git a/bservice/restore.go b/pkg/cloudapi/bservice/restore.go
similarity index 100%
rename from bservice/restore.go
rename to pkg/cloudapi/bservice/restore.go
diff --git a/bservice/snapshot_create.go b/pkg/cloudapi/bservice/snapshot_create.go
similarity index 100%
rename from bservice/snapshot_create.go
rename to pkg/cloudapi/bservice/snapshot_create.go
diff --git a/bservice/snapshot_delete.go b/pkg/cloudapi/bservice/snapshot_delete.go
similarity index 100%
rename from bservice/snapshot_delete.go
rename to pkg/cloudapi/bservice/snapshot_delete.go
diff --git a/bservice/snapshot_list.go b/pkg/cloudapi/bservice/snapshot_list.go
similarity index 100%
rename from bservice/snapshot_list.go
rename to pkg/cloudapi/bservice/snapshot_list.go
diff --git a/bservice/snapshot_rollback.go b/pkg/cloudapi/bservice/snapshot_rollback.go
similarity index 100%
rename from bservice/snapshot_rollback.go
rename to pkg/cloudapi/bservice/snapshot_rollback.go
diff --git a/bservice/start.go b/pkg/cloudapi/bservice/start.go
similarity index 100%
rename from bservice/start.go
rename to pkg/cloudapi/bservice/start.go
diff --git a/bservice/stop.go b/pkg/cloudapi/bservice/stop.go
similarity index 100%
rename from bservice/stop.go
rename to pkg/cloudapi/bservice/stop.go
diff --git a/compute/affinity_group_check_start.go b/pkg/cloudapi/compute/affinity_group_check_start.go
similarity index 100%
rename from compute/affinity_group_check_start.go
rename to pkg/cloudapi/compute/affinity_group_check_start.go
diff --git a/compute/affinity_label_remove.go b/pkg/cloudapi/compute/affinity_label_remove.go
similarity index 100%
rename from compute/affinity_label_remove.go
rename to pkg/cloudapi/compute/affinity_label_remove.go
diff --git a/compute/affinity_label_set.go b/pkg/cloudapi/compute/affinity_label_set.go
similarity index 100%
rename from compute/affinity_label_set.go
rename to pkg/cloudapi/compute/affinity_label_set.go
diff --git a/compute/affinity_relations.go b/pkg/cloudapi/compute/affinity_relations.go
similarity index 100%
rename from compute/affinity_relations.go
rename to pkg/cloudapi/compute/affinity_relations.go
diff --git a/compute/affinity_rule_add.go b/pkg/cloudapi/compute/affinity_rule_add.go
similarity index 100%
rename from compute/affinity_rule_add.go
rename to pkg/cloudapi/compute/affinity_rule_add.go
diff --git a/compute/affinity_rule_remove.go b/pkg/cloudapi/compute/affinity_rule_remove.go
similarity index 100%
rename from compute/affinity_rule_remove.go
rename to pkg/cloudapi/compute/affinity_rule_remove.go
diff --git a/compute/affinity_rules_clear.go b/pkg/cloudapi/compute/affinity_rules_clear.go
similarity index 100%
rename from compute/affinity_rules_clear.go
rename to pkg/cloudapi/compute/affinity_rules_clear.go
diff --git a/compute/anti_affinity_rule_add.go b/pkg/cloudapi/compute/anti_affinity_rule_add.go
similarity index 100%
rename from compute/anti_affinity_rule_add.go
rename to pkg/cloudapi/compute/anti_affinity_rule_add.go
diff --git a/compute/anti_affinity_rule_remove.go b/pkg/cloudapi/compute/anti_affinity_rule_remove.go
similarity index 100%
rename from compute/anti_affinity_rule_remove.go
rename to pkg/cloudapi/compute/anti_affinity_rule_remove.go
diff --git a/compute/anti_affinity_rules_clear.go b/pkg/cloudapi/compute/anti_affinity_rules_clear.go
similarity index 100%
rename from compute/anti_affinity_rules_clear.go
rename to pkg/cloudapi/compute/anti_affinity_rules_clear.go
diff --git a/compute/attach_gpu.go b/pkg/cloudapi/compute/attach_gpu.go
similarity index 100%
rename from compute/attach_gpu.go
rename to pkg/cloudapi/compute/attach_gpu.go
diff --git a/compute/attach_pci_device.go b/pkg/cloudapi/compute/attach_pci_device.go
similarity index 100%
rename from compute/attach_pci_device.go
rename to pkg/cloudapi/compute/attach_pci_device.go
diff --git a/compute/audits.go b/pkg/cloudapi/compute/audits.go
similarity index 100%
rename from compute/audits.go
rename to pkg/cloudapi/compute/audits.go
diff --git a/compute/cd_eject.go b/pkg/cloudapi/compute/cd_eject.go
similarity index 100%
rename from compute/cd_eject.go
rename to pkg/cloudapi/compute/cd_eject.go
diff --git a/compute/cd_insert.go b/pkg/cloudapi/compute/cd_insert.go
similarity index 100%
rename from compute/cd_insert.go
rename to pkg/cloudapi/compute/cd_insert.go
diff --git a/compute/clone.go b/pkg/cloudapi/compute/clone.go
similarity index 100%
rename from compute/clone.go
rename to pkg/cloudapi/compute/clone.go
diff --git a/compute/compute.go b/pkg/cloudapi/compute/compute.go
similarity index 100%
rename from compute/compute.go
rename to pkg/cloudapi/compute/compute.go
diff --git a/compute/create_template.go b/pkg/cloudapi/compute/create_template.go
similarity index 100%
rename from compute/create_template.go
rename to pkg/cloudapi/compute/create_template.go
diff --git a/compute/delete.go b/pkg/cloudapi/compute/delete.go
similarity index 100%
rename from compute/delete.go
rename to pkg/cloudapi/compute/delete.go
diff --git a/compute/detach_gpu.go b/pkg/cloudapi/compute/detach_gpu.go
similarity index 100%
rename from compute/detach_gpu.go
rename to pkg/cloudapi/compute/detach_gpu.go
diff --git a/compute/detach_pci_device.go b/pkg/cloudapi/compute/detach_pci_device.go
similarity index 100%
rename from compute/detach_pci_device.go
rename to pkg/cloudapi/compute/detach_pci_device.go
diff --git a/compute/disable.go b/pkg/cloudapi/compute/disable.go
similarity index 100%
rename from compute/disable.go
rename to pkg/cloudapi/compute/disable.go
diff --git a/compute/disk_add.go b/pkg/cloudapi/compute/disk_add.go
similarity index 100%
rename from compute/disk_add.go
rename to pkg/cloudapi/compute/disk_add.go
diff --git a/compute/disk_attach.go b/pkg/cloudapi/compute/disk_attach.go
similarity index 100%
rename from compute/disk_attach.go
rename to pkg/cloudapi/compute/disk_attach.go
diff --git a/compute/disk_del.go b/pkg/cloudapi/compute/disk_del.go
similarity index 100%
rename from compute/disk_del.go
rename to pkg/cloudapi/compute/disk_del.go
diff --git a/compute/disk_detach.go b/pkg/cloudapi/compute/disk_detach.go
similarity index 100%
rename from compute/disk_detach.go
rename to pkg/cloudapi/compute/disk_detach.go
diff --git a/compute/disk_qos.go b/pkg/cloudapi/compute/disk_qos.go
similarity index 100%
rename from compute/disk_qos.go
rename to pkg/cloudapi/compute/disk_qos.go
diff --git a/compute/disk_resize.go b/pkg/cloudapi/compute/disk_resize.go
similarity index 100%
rename from compute/disk_resize.go
rename to pkg/cloudapi/compute/disk_resize.go
diff --git a/compute/enable.go b/pkg/cloudapi/compute/enable.go
similarity index 100%
rename from compute/enable.go
rename to pkg/cloudapi/compute/enable.go
diff --git a/compute/get.go b/pkg/cloudapi/compute/get.go
similarity index 100%
rename from compute/get.go
rename to pkg/cloudapi/compute/get.go
diff --git a/compute/get_audits.go b/pkg/cloudapi/compute/get_audits.go
similarity index 100%
rename from compute/get_audits.go
rename to pkg/cloudapi/compute/get_audits.go
diff --git a/compute/get_console_url.go b/pkg/cloudapi/compute/get_console_url.go
similarity index 100%
rename from compute/get_console_url.go
rename to pkg/cloudapi/compute/get_console_url.go
diff --git a/compute/get_log.go b/pkg/cloudapi/compute/get_log.go
similarity index 100%
rename from compute/get_log.go
rename to pkg/cloudapi/compute/get_log.go
diff --git a/compute/list.go b/pkg/cloudapi/compute/list.go
similarity index 100%
rename from compute/list.go
rename to pkg/cloudapi/compute/list.go
diff --git a/compute/list_deleted.go b/pkg/cloudapi/compute/list_deleted.go
similarity index 100%
rename from compute/list_deleted.go
rename to pkg/cloudapi/compute/list_deleted.go
diff --git a/compute/list_pci_device.go b/pkg/cloudapi/compute/list_pci_device.go
similarity index 100%
rename from compute/list_pci_device.go
rename to pkg/cloudapi/compute/list_pci_device.go
diff --git a/compute/list_vgpu.go b/pkg/cloudapi/compute/list_vgpu.go
similarity index 100%
rename from compute/list_vgpu.go
rename to pkg/cloudapi/compute/list_vgpu.go
diff --git a/compute/models.go b/pkg/cloudapi/compute/models.go
similarity index 100%
rename from compute/models.go
rename to pkg/cloudapi/compute/models.go
diff --git a/compute/move_to_rg.go b/pkg/cloudapi/compute/move_to_rg.go
similarity index 100%
rename from compute/move_to_rg.go
rename to pkg/cloudapi/compute/move_to_rg.go
diff --git a/compute/net_attach.go b/pkg/cloudapi/compute/net_attach.go
similarity index 100%
rename from compute/net_attach.go
rename to pkg/cloudapi/compute/net_attach.go
diff --git a/compute/net_detach.go b/pkg/cloudapi/compute/net_detach.go
similarity index 100%
rename from compute/net_detach.go
rename to pkg/cloudapi/compute/net_detach.go
diff --git a/compute/pause.go b/pkg/cloudapi/compute/pause.go
similarity index 100%
rename from compute/pause.go
rename to pkg/cloudapi/compute/pause.go
diff --git a/compute/pfw_add.go b/pkg/cloudapi/compute/pfw_add.go
similarity index 100%
rename from compute/pfw_add.go
rename to pkg/cloudapi/compute/pfw_add.go
diff --git a/compute/pfw_del.go b/pkg/cloudapi/compute/pfw_del.go
similarity index 100%
rename from compute/pfw_del.go
rename to pkg/cloudapi/compute/pfw_del.go
diff --git a/compute/pfw_list.go b/pkg/cloudapi/compute/pfw_list.go
similarity index 100%
rename from compute/pfw_list.go
rename to pkg/cloudapi/compute/pfw_list.go
diff --git a/compute/pin_to_stack.go b/pkg/cloudapi/compute/pin_to_stack.go
similarity index 100%
rename from compute/pin_to_stack.go
rename to pkg/cloudapi/compute/pin_to_stack.go
diff --git a/compute/power_cycle.go b/pkg/cloudapi/compute/power_cycle.go
similarity index 100%
rename from compute/power_cycle.go
rename to pkg/cloudapi/compute/power_cycle.go
diff --git a/compute/reboot.go b/pkg/cloudapi/compute/reboot.go
similarity index 100%
rename from compute/reboot.go
rename to pkg/cloudapi/compute/reboot.go
diff --git a/compute/redeploy.go b/pkg/cloudapi/compute/redeploy.go
similarity index 100%
rename from compute/redeploy.go
rename to pkg/cloudapi/compute/redeploy.go
diff --git a/compute/reset.go b/pkg/cloudapi/compute/reset.go
similarity index 100%
rename from compute/reset.go
rename to pkg/cloudapi/compute/reset.go
diff --git a/compute/resize.go b/pkg/cloudapi/compute/resize.go
similarity index 100%
rename from compute/resize.go
rename to pkg/cloudapi/compute/resize.go
diff --git a/compute/restore.go b/pkg/cloudapi/compute/restore.go
similarity index 100%
rename from compute/restore.go
rename to pkg/cloudapi/compute/restore.go
diff --git a/compute/resume.go b/pkg/cloudapi/compute/resume.go
similarity index 100%
rename from compute/resume.go
rename to pkg/cloudapi/compute/resume.go
diff --git a/compute/snapshot_create.go b/pkg/cloudapi/compute/snapshot_create.go
similarity index 100%
rename from compute/snapshot_create.go
rename to pkg/cloudapi/compute/snapshot_create.go
diff --git a/compute/snapshot_delete.go b/pkg/cloudapi/compute/snapshot_delete.go
similarity index 100%
rename from compute/snapshot_delete.go
rename to pkg/cloudapi/compute/snapshot_delete.go
diff --git a/compute/snapshot_list.go b/pkg/cloudapi/compute/snapshot_list.go
similarity index 100%
rename from compute/snapshot_list.go
rename to pkg/cloudapi/compute/snapshot_list.go
diff --git a/compute/snapshot_rollback.go b/pkg/cloudapi/compute/snapshot_rollback.go
similarity index 100%
rename from compute/snapshot_rollback.go
rename to pkg/cloudapi/compute/snapshot_rollback.go
diff --git a/compute/snapshot_usage.go b/pkg/cloudapi/compute/snapshot_usage.go
similarity index 100%
rename from compute/snapshot_usage.go
rename to pkg/cloudapi/compute/snapshot_usage.go
diff --git a/compute/start.go b/pkg/cloudapi/compute/start.go
similarity index 100%
rename from compute/start.go
rename to pkg/cloudapi/compute/start.go
diff --git a/compute/stop.go b/pkg/cloudapi/compute/stop.go
similarity index 100%
rename from compute/stop.go
rename to pkg/cloudapi/compute/stop.go
diff --git a/compute/tag_add.go b/pkg/cloudapi/compute/tag_add.go
similarity index 100%
rename from compute/tag_add.go
rename to pkg/cloudapi/compute/tag_add.go
diff --git a/compute/tag_remove.go b/pkg/cloudapi/compute/tag_remove.go
similarity index 100%
rename from compute/tag_remove.go
rename to pkg/cloudapi/compute/tag_remove.go
diff --git a/compute/unpin_from_stack.go b/pkg/cloudapi/compute/unpin_from_stack.go
similarity index 100%
rename from compute/unpin_from_stack.go
rename to pkg/cloudapi/compute/unpin_from_stack.go
diff --git a/compute/update.go b/pkg/cloudapi/compute/update.go
similarity index 100%
rename from compute/update.go
rename to pkg/cloudapi/compute/update.go
diff --git a/compute/user_grant.go b/pkg/cloudapi/compute/user_grant.go
similarity index 100%
rename from compute/user_grant.go
rename to pkg/cloudapi/compute/user_grant.go
diff --git a/compute/user_list.go b/pkg/cloudapi/compute/user_list.go
similarity index 100%
rename from compute/user_list.go
rename to pkg/cloudapi/compute/user_list.go
diff --git a/compute/user_revoke.go b/pkg/cloudapi/compute/user_revoke.go
similarity index 100%
rename from compute/user_revoke.go
rename to pkg/cloudapi/compute/user_revoke.go
diff --git a/compute/user_update.go b/pkg/cloudapi/compute/user_update.go
similarity index 100%
rename from compute/user_update.go
rename to pkg/cloudapi/compute/user_update.go
diff --git a/computeci/computeci.go b/pkg/cloudapi/computeci/computeci.go
similarity index 100%
rename from computeci/computeci.go
rename to pkg/cloudapi/computeci/computeci.go
diff --git a/computeci/get.go b/pkg/cloudapi/computeci/get.go
similarity index 100%
rename from computeci/get.go
rename to pkg/cloudapi/computeci/get.go
diff --git a/computeci/list.go b/pkg/cloudapi/computeci/list.go
similarity index 100%
rename from computeci/list.go
rename to pkg/cloudapi/computeci/list.go
diff --git a/computeci/models.go b/pkg/cloudapi/computeci/models.go
similarity index 100%
rename from computeci/models.go
rename to pkg/cloudapi/computeci/models.go
diff --git a/disks/create.go b/pkg/cloudapi/disks/create.go
similarity index 100%
rename from disks/create.go
rename to pkg/cloudapi/disks/create.go
diff --git a/disks/delete.go b/pkg/cloudapi/disks/delete.go
similarity index 100%
rename from disks/delete.go
rename to pkg/cloudapi/disks/delete.go
diff --git a/disks/delete_disks.go b/pkg/cloudapi/disks/delete_disks.go
similarity index 100%
rename from disks/delete_disks.go
rename to pkg/cloudapi/disks/delete_disks.go
diff --git a/disks/disks.go b/pkg/cloudapi/disks/disks.go
similarity index 100%
rename from disks/disks.go
rename to pkg/cloudapi/disks/disks.go
diff --git a/disks/get.go b/pkg/cloudapi/disks/get.go
similarity index 100%
rename from disks/get.go
rename to pkg/cloudapi/disks/get.go
diff --git a/disks/limitio.go b/pkg/cloudapi/disks/limitio.go
similarity index 100%
rename from disks/limitio.go
rename to pkg/cloudapi/disks/limitio.go
diff --git a/disks/list.go b/pkg/cloudapi/disks/list.go
similarity index 100%
rename from disks/list.go
rename to pkg/cloudapi/disks/list.go
diff --git a/disks/list_types.go b/pkg/cloudapi/disks/list_types.go
similarity index 100%
rename from disks/list_types.go
rename to pkg/cloudapi/disks/list_types.go
diff --git a/disks/list_unattached.go b/pkg/cloudapi/disks/list_unattached.go
similarity index 100%
rename from disks/list_unattached.go
rename to pkg/cloudapi/disks/list_unattached.go
diff --git a/disks/models.go b/pkg/cloudapi/disks/models.go
similarity index 100%
rename from disks/models.go
rename to pkg/cloudapi/disks/models.go
diff --git a/disks/rename.go b/pkg/cloudapi/disks/rename.go
similarity index 100%
rename from disks/rename.go
rename to pkg/cloudapi/disks/rename.go
diff --git a/disks/resize.go b/pkg/cloudapi/disks/resize.go
similarity index 100%
rename from disks/resize.go
rename to pkg/cloudapi/disks/resize.go
diff --git a/disks/restore.go b/pkg/cloudapi/disks/restore.go
similarity index 100%
rename from disks/restore.go
rename to pkg/cloudapi/disks/restore.go
diff --git a/disks/search.go b/pkg/cloudapi/disks/search.go
similarity index 100%
rename from disks/search.go
rename to pkg/cloudapi/disks/search.go
diff --git a/disks/snapshot_delete.go b/pkg/cloudapi/disks/snapshot_delete.go
similarity index 100%
rename from disks/snapshot_delete.go
rename to pkg/cloudapi/disks/snapshot_delete.go
diff --git a/disks/snapshot_rollback.go b/pkg/cloudapi/disks/snapshot_rollback.go
similarity index 100%
rename from disks/snapshot_rollback.go
rename to pkg/cloudapi/disks/snapshot_rollback.go
diff --git a/extnet/extnet.go b/pkg/cloudapi/extnet/extnet.go
similarity index 100%
rename from extnet/extnet.go
rename to pkg/cloudapi/extnet/extnet.go
diff --git a/extnet/get.go b/pkg/cloudapi/extnet/get.go
similarity index 100%
rename from extnet/get.go
rename to pkg/cloudapi/extnet/get.go
diff --git a/extnet/get_default.go b/pkg/cloudapi/extnet/get_default.go
similarity index 100%
rename from extnet/get_default.go
rename to pkg/cloudapi/extnet/get_default.go
diff --git a/extnet/list.go b/pkg/cloudapi/extnet/list.go
similarity index 100%
rename from extnet/list.go
rename to pkg/cloudapi/extnet/list.go
diff --git a/extnet/list_computes.go b/pkg/cloudapi/extnet/list_computes.go
similarity index 100%
rename from extnet/list_computes.go
rename to pkg/cloudapi/extnet/list_computes.go
diff --git a/extnet/models.go b/pkg/cloudapi/extnet/models.go
similarity index 100%
rename from extnet/models.go
rename to pkg/cloudapi/extnet/models.go
diff --git a/flipgroup/compute_add.go b/pkg/cloudapi/flipgroup/compute_add.go
similarity index 100%
rename from flipgroup/compute_add.go
rename to pkg/cloudapi/flipgroup/compute_add.go
diff --git a/flipgroup/compute_remove.go b/pkg/cloudapi/flipgroup/compute_remove.go
similarity index 100%
rename from flipgroup/compute_remove.go
rename to pkg/cloudapi/flipgroup/compute_remove.go
diff --git a/flipgroup/create.go b/pkg/cloudapi/flipgroup/create.go
similarity index 100%
rename from flipgroup/create.go
rename to pkg/cloudapi/flipgroup/create.go
diff --git a/flipgroup/delete.go b/pkg/cloudapi/flipgroup/delete.go
similarity index 100%
rename from flipgroup/delete.go
rename to pkg/cloudapi/flipgroup/delete.go
diff --git a/flipgroup/edit.go b/pkg/cloudapi/flipgroup/edit.go
similarity index 100%
rename from flipgroup/edit.go
rename to pkg/cloudapi/flipgroup/edit.go
diff --git a/flipgroup/flipgroup.go b/pkg/cloudapi/flipgroup/flipgroup.go
similarity index 100%
rename from flipgroup/flipgroup.go
rename to pkg/cloudapi/flipgroup/flipgroup.go
diff --git a/flipgroup/get.go b/pkg/cloudapi/flipgroup/get.go
similarity index 100%
rename from flipgroup/get.go
rename to pkg/cloudapi/flipgroup/get.go
diff --git a/flipgroup/list.go b/pkg/cloudapi/flipgroup/list.go
similarity index 100%
rename from flipgroup/list.go
rename to pkg/cloudapi/flipgroup/list.go
diff --git a/flipgroup/models.go b/pkg/cloudapi/flipgroup/models.go
similarity index 100%
rename from flipgroup/models.go
rename to pkg/cloudapi/flipgroup/models.go
diff --git a/image/create.go b/pkg/cloudapi/image/create.go
similarity index 100%
rename from image/create.go
rename to pkg/cloudapi/image/create.go
diff --git a/image/create_virtual.go b/pkg/cloudapi/image/create_virtual.go
similarity index 100%
rename from image/create_virtual.go
rename to pkg/cloudapi/image/create_virtual.go
diff --git a/image/delete.go b/pkg/cloudapi/image/delete.go
similarity index 100%
rename from image/delete.go
rename to pkg/cloudapi/image/delete.go
diff --git a/image/get.go b/pkg/cloudapi/image/get.go
similarity index 100%
rename from image/get.go
rename to pkg/cloudapi/image/get.go
diff --git a/image/image.go b/pkg/cloudapi/image/image.go
similarity index 100%
rename from image/image.go
rename to pkg/cloudapi/image/image.go
diff --git a/image/link.go b/pkg/cloudapi/image/link.go
similarity index 100%
rename from image/link.go
rename to pkg/cloudapi/image/link.go
diff --git a/image/list.go b/pkg/cloudapi/image/list.go
similarity index 100%
rename from image/list.go
rename to pkg/cloudapi/image/list.go
diff --git a/image/models.go b/pkg/cloudapi/image/models.go
similarity index 100%
rename from image/models.go
rename to pkg/cloudapi/image/models.go
diff --git a/image/rename.go b/pkg/cloudapi/image/rename.go
similarity index 100%
rename from image/rename.go
rename to pkg/cloudapi/image/rename.go
diff --git a/k8ci/get.go b/pkg/cloudapi/k8ci/get.go
similarity index 100%
rename from k8ci/get.go
rename to pkg/cloudapi/k8ci/get.go
diff --git a/k8ci/k8ci.go b/pkg/cloudapi/k8ci/k8ci.go
similarity index 100%
rename from k8ci/k8ci.go
rename to pkg/cloudapi/k8ci/k8ci.go
diff --git a/k8ci/list.go b/pkg/cloudapi/k8ci/list.go
similarity index 100%
rename from k8ci/list.go
rename to pkg/cloudapi/k8ci/list.go
diff --git a/k8ci/list_deleted.go b/pkg/cloudapi/k8ci/list_deleted.go
similarity index 100%
rename from k8ci/list_deleted.go
rename to pkg/cloudapi/k8ci/list_deleted.go
diff --git a/k8ci/models.go b/pkg/cloudapi/k8ci/models.go
similarity index 100%
rename from k8ci/models.go
rename to pkg/cloudapi/k8ci/models.go
diff --git a/k8s/create.go b/pkg/cloudapi/k8s/create.go
similarity index 100%
rename from k8s/create.go
rename to pkg/cloudapi/k8s/create.go
diff --git a/k8s/delete.go b/pkg/cloudapi/k8s/delete.go
similarity index 100%
rename from k8s/delete.go
rename to pkg/cloudapi/k8s/delete.go
diff --git a/k8s/delete_master_from_group.go b/pkg/cloudapi/k8s/delete_master_from_group.go
similarity index 100%
rename from k8s/delete_master_from_group.go
rename to pkg/cloudapi/k8s/delete_master_from_group.go
diff --git a/k8s/delete_worker_from_group.go b/pkg/cloudapi/k8s/delete_worker_from_group.go
similarity index 100%
rename from k8s/delete_worker_from_group.go
rename to pkg/cloudapi/k8s/delete_worker_from_group.go
diff --git a/k8s/disable_enable.go b/pkg/cloudapi/k8s/disable_enable.go
similarity index 100%
rename from k8s/disable_enable.go
rename to pkg/cloudapi/k8s/disable_enable.go
diff --git a/k8s/find_group_by_label.go b/pkg/cloudapi/k8s/find_group_by_label.go
similarity index 100%
rename from k8s/find_group_by_label.go
rename to pkg/cloudapi/k8s/find_group_by_label.go
diff --git a/k8s/get.go b/pkg/cloudapi/k8s/get.go
similarity index 100%
rename from k8s/get.go
rename to pkg/cloudapi/k8s/get.go
diff --git a/k8s/get_config.go b/pkg/cloudapi/k8s/get_config.go
similarity index 100%
rename from k8s/get_config.go
rename to pkg/cloudapi/k8s/get_config.go
diff --git a/k8s/get_node_annotations.go b/pkg/cloudapi/k8s/get_node_annotations.go
similarity index 100%
rename from k8s/get_node_annotations.go
rename to pkg/cloudapi/k8s/get_node_annotations.go
diff --git a/k8s/get_node_taints.go b/pkg/cloudapi/k8s/get_node_taints.go
similarity index 100%
rename from k8s/get_node_taints.go
rename to pkg/cloudapi/k8s/get_node_taints.go
diff --git a/k8s/k8s.go b/pkg/cloudapi/k8s/k8s.go
similarity index 100%
rename from k8s/k8s.go
rename to pkg/cloudapi/k8s/k8s.go
diff --git a/k8s/list.go b/pkg/cloudapi/k8s/list.go
similarity index 100%
rename from k8s/list.go
rename to pkg/cloudapi/k8s/list.go
diff --git a/k8s/list_deleted.go b/pkg/cloudapi/k8s/list_deleted.go
similarity index 100%
rename from k8s/list_deleted.go
rename to pkg/cloudapi/k8s/list_deleted.go
diff --git a/k8s/models.go b/pkg/cloudapi/k8s/models.go
similarity index 100%
rename from k8s/models.go
rename to pkg/cloudapi/k8s/models.go
diff --git a/k8s/restore.go b/pkg/cloudapi/k8s/restore.go
similarity index 100%
rename from k8s/restore.go
rename to pkg/cloudapi/k8s/restore.go
diff --git a/k8s/start.go b/pkg/cloudapi/k8s/start.go
similarity index 100%
rename from k8s/start.go
rename to pkg/cloudapi/k8s/start.go
diff --git a/k8s/stop.go b/pkg/cloudapi/k8s/stop.go
similarity index 100%
rename from k8s/stop.go
rename to pkg/cloudapi/k8s/stop.go
diff --git a/k8s/update.go b/pkg/cloudapi/k8s/update.go
similarity index 100%
rename from k8s/update.go
rename to pkg/cloudapi/k8s/update.go
diff --git a/k8s/worker_add.go b/pkg/cloudapi/k8s/worker_add.go
similarity index 100%
rename from k8s/worker_add.go
rename to pkg/cloudapi/k8s/worker_add.go
diff --git a/k8s/worker_reset.go b/pkg/cloudapi/k8s/worker_reset.go
similarity index 100%
rename from k8s/worker_reset.go
rename to pkg/cloudapi/k8s/worker_reset.go
diff --git a/k8s/worker_restart.go b/pkg/cloudapi/k8s/worker_restart.go
similarity index 100%
rename from k8s/worker_restart.go
rename to pkg/cloudapi/k8s/worker_restart.go
diff --git a/k8s/workers_group_add.go b/pkg/cloudapi/k8s/workers_group_add.go
similarity index 100%
rename from k8s/workers_group_add.go
rename to pkg/cloudapi/k8s/workers_group_add.go
diff --git a/k8s/workers_group_delete.go b/pkg/cloudapi/k8s/workers_group_delete.go
similarity index 100%
rename from k8s/workers_group_delete.go
rename to pkg/cloudapi/k8s/workers_group_delete.go
diff --git a/k8s/workers_group_get_by_name.go b/pkg/cloudapi/k8s/workers_group_get_by_name.go
similarity index 100%
rename from k8s/workers_group_get_by_name.go
rename to pkg/cloudapi/k8s/workers_group_get_by_name.go
diff --git a/kvmppc/create.go b/pkg/cloudapi/kvmppc/create.go
similarity index 100%
rename from kvmppc/create.go
rename to pkg/cloudapi/kvmppc/create.go
diff --git a/kvmppc/create_blank.go b/pkg/cloudapi/kvmppc/create_blank.go
similarity index 100%
rename from kvmppc/create_blank.go
rename to pkg/cloudapi/kvmppc/create_blank.go
diff --git a/kvmppc/kvmppc.go b/pkg/cloudapi/kvmppc/kvmppc.go
similarity index 100%
rename from kvmppc/kvmppc.go
rename to pkg/cloudapi/kvmppc/kvmppc.go
diff --git a/kvmx86/create.go b/pkg/cloudapi/kvmx86/create.go
similarity index 100%
rename from kvmx86/create.go
rename to pkg/cloudapi/kvmx86/create.go
diff --git a/kvmx86/create_blank.go b/pkg/cloudapi/kvmx86/create_blank.go
similarity index 100%
rename from kvmx86/create_blank.go
rename to pkg/cloudapi/kvmx86/create_blank.go
diff --git a/kvmx86/kvmx86.go b/pkg/cloudapi/kvmx86/kvmx86.go
similarity index 100%
rename from kvmx86/kvmx86.go
rename to pkg/cloudapi/kvmx86/kvmx86.go
diff --git a/lb/backend_create.go b/pkg/cloudapi/lb/backend_create.go
similarity index 100%
rename from lb/backend_create.go
rename to pkg/cloudapi/lb/backend_create.go
diff --git a/lb/backend_delete.go b/pkg/cloudapi/lb/backend_delete.go
similarity index 100%
rename from lb/backend_delete.go
rename to pkg/cloudapi/lb/backend_delete.go
diff --git a/lb/backend_server_add.go b/pkg/cloudapi/lb/backend_server_add.go
similarity index 100%
rename from lb/backend_server_add.go
rename to pkg/cloudapi/lb/backend_server_add.go
diff --git a/lb/backend_server_delete.go b/pkg/cloudapi/lb/backend_server_delete.go
similarity index 100%
rename from lb/backend_server_delete.go
rename to pkg/cloudapi/lb/backend_server_delete.go
diff --git a/lb/backend_server_update.go b/pkg/cloudapi/lb/backend_server_update.go
similarity index 100%
rename from lb/backend_server_update.go
rename to pkg/cloudapi/lb/backend_server_update.go
diff --git a/lb/backend_update.go b/pkg/cloudapi/lb/backend_update.go
similarity index 100%
rename from lb/backend_update.go
rename to pkg/cloudapi/lb/backend_update.go
diff --git a/lb/config_reset.go b/pkg/cloudapi/lb/config_reset.go
similarity index 100%
rename from lb/config_reset.go
rename to pkg/cloudapi/lb/config_reset.go
diff --git a/lb/create.go b/pkg/cloudapi/lb/create.go
similarity index 100%
rename from lb/create.go
rename to pkg/cloudapi/lb/create.go
diff --git a/lb/delete.go b/pkg/cloudapi/lb/delete.go
similarity index 100%
rename from lb/delete.go
rename to pkg/cloudapi/lb/delete.go
diff --git a/lb/disable_enable.go b/pkg/cloudapi/lb/disable_enable.go
similarity index 100%
rename from lb/disable_enable.go
rename to pkg/cloudapi/lb/disable_enable.go
diff --git a/lb/frontend_bind.go b/pkg/cloudapi/lb/frontend_bind.go
similarity index 100%
rename from lb/frontend_bind.go
rename to pkg/cloudapi/lb/frontend_bind.go
diff --git a/lb/frontend_bind_delete.go b/pkg/cloudapi/lb/frontend_bind_delete.go
similarity index 100%
rename from lb/frontend_bind_delete.go
rename to pkg/cloudapi/lb/frontend_bind_delete.go
diff --git a/lb/frontend_bind_update.go b/pkg/cloudapi/lb/frontend_bind_update.go
similarity index 100%
rename from lb/frontend_bind_update.go
rename to pkg/cloudapi/lb/frontend_bind_update.go
diff --git a/lb/frontend_create.go b/pkg/cloudapi/lb/frontend_create.go
similarity index 100%
rename from lb/frontend_create.go
rename to pkg/cloudapi/lb/frontend_create.go
diff --git a/lb/frontend_delete.go b/pkg/cloudapi/lb/frontend_delete.go
similarity index 100%
rename from lb/frontend_delete.go
rename to pkg/cloudapi/lb/frontend_delete.go
diff --git a/lb/get.go b/pkg/cloudapi/lb/get.go
similarity index 100%
rename from lb/get.go
rename to pkg/cloudapi/lb/get.go
diff --git a/lb/lb.go b/pkg/cloudapi/lb/lb.go
similarity index 100%
rename from lb/lb.go
rename to pkg/cloudapi/lb/lb.go
diff --git a/lb/list.go b/pkg/cloudapi/lb/list.go
similarity index 100%
rename from lb/list.go
rename to pkg/cloudapi/lb/list.go
diff --git a/lb/list_deleted.go b/pkg/cloudapi/lb/list_deleted.go
similarity index 100%
rename from lb/list_deleted.go
rename to pkg/cloudapi/lb/list_deleted.go
diff --git a/lb/models.go b/pkg/cloudapi/lb/models.go
similarity index 100%
rename from lb/models.go
rename to pkg/cloudapi/lb/models.go
diff --git a/lb/restart.go b/pkg/cloudapi/lb/restart.go
similarity index 100%
rename from lb/restart.go
rename to pkg/cloudapi/lb/restart.go
diff --git a/lb/restore.go b/pkg/cloudapi/lb/restore.go
similarity index 100%
rename from lb/restore.go
rename to pkg/cloudapi/lb/restore.go
diff --git a/lb/update.go b/pkg/cloudapi/lb/update.go
similarity index 100%
rename from lb/update.go
rename to pkg/cloudapi/lb/update.go
diff --git a/locations/get_url.go b/pkg/cloudapi/locations/get_url.go
similarity index 100%
rename from locations/get_url.go
rename to pkg/cloudapi/locations/get_url.go
diff --git a/locations/list.go b/pkg/cloudapi/locations/list.go
similarity index 100%
rename from locations/list.go
rename to pkg/cloudapi/locations/list.go
diff --git a/locations/locations.go b/pkg/cloudapi/locations/locations.go
similarity index 100%
rename from locations/locations.go
rename to pkg/cloudapi/locations/locations.go
diff --git a/locations/models.go b/pkg/cloudapi/locations/models.go
similarity index 100%
rename from locations/models.go
rename to pkg/cloudapi/locations/models.go
diff --git a/rg/access_grant.go b/pkg/cloudapi/rg/access_grant.go
similarity index 100%
rename from rg/access_grant.go
rename to pkg/cloudapi/rg/access_grant.go
diff --git a/rg/access_revoke.go b/pkg/cloudapi/rg/access_revoke.go
similarity index 100%
rename from rg/access_revoke.go
rename to pkg/cloudapi/rg/access_revoke.go
diff --git a/rg/affinity_group_computes.go b/pkg/cloudapi/rg/affinity_group_computes.go
similarity index 100%
rename from rg/affinity_group_computes.go
rename to pkg/cloudapi/rg/affinity_group_computes.go
diff --git a/rg/affinity_groups_get.go b/pkg/cloudapi/rg/affinity_groups_get.go
similarity index 100%
rename from rg/affinity_groups_get.go
rename to pkg/cloudapi/rg/affinity_groups_get.go
diff --git a/rg/affinity_groups_list.go b/pkg/cloudapi/rg/affinity_groups_list.go
similarity index 100%
rename from rg/affinity_groups_list.go
rename to pkg/cloudapi/rg/affinity_groups_list.go
diff --git a/rg/audits.go b/pkg/cloudapi/rg/audits.go
similarity index 100%
rename from rg/audits.go
rename to pkg/cloudapi/rg/audits.go
diff --git a/rg/create.go b/pkg/cloudapi/rg/create.go
similarity index 100%
rename from rg/create.go
rename to pkg/cloudapi/rg/create.go
diff --git a/rg/delete.go b/pkg/cloudapi/rg/delete.go
similarity index 100%
rename from rg/delete.go
rename to pkg/cloudapi/rg/delete.go
diff --git a/rg/disable.go b/pkg/cloudapi/rg/disable.go
similarity index 100%
rename from rg/disable.go
rename to pkg/cloudapi/rg/disable.go
diff --git a/rg/enable.go b/pkg/cloudapi/rg/enable.go
similarity index 100%
rename from rg/enable.go
rename to pkg/cloudapi/rg/enable.go
diff --git a/rg/get.go b/pkg/cloudapi/rg/get.go
similarity index 100%
rename from rg/get.go
rename to pkg/cloudapi/rg/get.go
diff --git a/rg/list.go b/pkg/cloudapi/rg/list.go
similarity index 100%
rename from rg/list.go
rename to pkg/cloudapi/rg/list.go
diff --git a/rg/list_computes.go b/pkg/cloudapi/rg/list_computes.go
similarity index 100%
rename from rg/list_computes.go
rename to pkg/cloudapi/rg/list_computes.go
diff --git a/rg/list_deleted.go b/pkg/cloudapi/rg/list_deleted.go
similarity index 100%
rename from rg/list_deleted.go
rename to pkg/cloudapi/rg/list_deleted.go
diff --git a/rg/list_lb.go b/pkg/cloudapi/rg/list_lb.go
similarity index 100%
rename from rg/list_lb.go
rename to pkg/cloudapi/rg/list_lb.go
diff --git a/rg/list_pfw.go b/pkg/cloudapi/rg/list_pfw.go
similarity index 100%
rename from rg/list_pfw.go
rename to pkg/cloudapi/rg/list_pfw.go
diff --git a/rg/list_vins.go b/pkg/cloudapi/rg/list_vins.go
similarity index 100%
rename from rg/list_vins.go
rename to pkg/cloudapi/rg/list_vins.go
diff --git a/rg/models.go b/pkg/cloudapi/rg/models.go
similarity index 100%
rename from rg/models.go
rename to pkg/cloudapi/rg/models.go
diff --git a/rg/restore.go b/pkg/cloudapi/rg/restore.go
similarity index 100%
rename from rg/restore.go
rename to pkg/cloudapi/rg/restore.go
diff --git a/rg/rg.go b/pkg/cloudapi/rg/rg.go
similarity index 100%
rename from rg/rg.go
rename to pkg/cloudapi/rg/rg.go
diff --git a/rg/set_def_net.go b/pkg/cloudapi/rg/set_def_net.go
similarity index 100%
rename from rg/set_def_net.go
rename to pkg/cloudapi/rg/set_def_net.go
diff --git a/rg/update.go b/pkg/cloudapi/rg/update.go
similarity index 100%
rename from rg/update.go
rename to pkg/cloudapi/rg/update.go
diff --git a/rg/usage.go b/pkg/cloudapi/rg/usage.go
similarity index 100%
rename from rg/usage.go
rename to pkg/cloudapi/rg/usage.go
diff --git a/sizes/list.go b/pkg/cloudapi/sizes/list.go
similarity index 100%
rename from sizes/list.go
rename to pkg/cloudapi/sizes/list.go
diff --git a/sizes/models.go b/pkg/cloudapi/sizes/models.go
similarity index 100%
rename from sizes/models.go
rename to pkg/cloudapi/sizes/models.go
diff --git a/sizes/sizes.go b/pkg/cloudapi/sizes/sizes.go
similarity index 100%
rename from sizes/sizes.go
rename to pkg/cloudapi/sizes/sizes.go
diff --git a/tasks/get.go b/pkg/cloudapi/tasks/get.go
similarity index 100%
rename from tasks/get.go
rename to pkg/cloudapi/tasks/get.go
diff --git a/tasks/list.go b/pkg/cloudapi/tasks/list.go
similarity index 100%
rename from tasks/list.go
rename to pkg/cloudapi/tasks/list.go
diff --git a/tasks/models.go b/pkg/cloudapi/tasks/models.go
similarity index 100%
rename from tasks/models.go
rename to pkg/cloudapi/tasks/models.go
diff --git a/tasks/tasks.go b/pkg/cloudapi/tasks/tasks.go
similarity index 100%
rename from tasks/tasks.go
rename to pkg/cloudapi/tasks/tasks.go
diff --git a/vins/audits.go b/pkg/cloudapi/vins/audits.go
similarity index 100%
rename from vins/audits.go
rename to pkg/cloudapi/vins/audits.go
diff --git a/vins/create_in_account.go b/pkg/cloudapi/vins/create_in_account.go
similarity index 100%
rename from vins/create_in_account.go
rename to pkg/cloudapi/vins/create_in_account.go
diff --git a/vins/create_in_rg.go b/pkg/cloudapi/vins/create_in_rg.go
similarity index 100%
rename from vins/create_in_rg.go
rename to pkg/cloudapi/vins/create_in_rg.go
diff --git a/vins/delete.go b/pkg/cloudapi/vins/delete.go
similarity index 100%
rename from vins/delete.go
rename to pkg/cloudapi/vins/delete.go
diff --git a/vins/disable_enable.go b/pkg/cloudapi/vins/disable_enable.go
similarity index 100%
rename from vins/disable_enable.go
rename to pkg/cloudapi/vins/disable_enable.go
diff --git a/vins/extnet_connect.go b/pkg/cloudapi/vins/extnet_connect.go
similarity index 100%
rename from vins/extnet_connect.go
rename to pkg/cloudapi/vins/extnet_connect.go
diff --git a/vins/extnet_disconnect.go b/pkg/cloudapi/vins/extnet_disconnect.go
similarity index 100%
rename from vins/extnet_disconnect.go
rename to pkg/cloudapi/vins/extnet_disconnect.go
diff --git a/vins/extnet_list.go b/pkg/cloudapi/vins/extnet_list.go
similarity index 100%
rename from vins/extnet_list.go
rename to pkg/cloudapi/vins/extnet_list.go
diff --git a/vins/get.go b/pkg/cloudapi/vins/get.go
similarity index 100%
rename from vins/get.go
rename to pkg/cloudapi/vins/get.go
diff --git a/vins/ip_list.go b/pkg/cloudapi/vins/ip_list.go
similarity index 100%
rename from vins/ip_list.go
rename to pkg/cloudapi/vins/ip_list.go
diff --git a/vins/ip_release.go b/pkg/cloudapi/vins/ip_release.go
similarity index 100%
rename from vins/ip_release.go
rename to pkg/cloudapi/vins/ip_release.go
diff --git a/vins/ip_reserve.go b/pkg/cloudapi/vins/ip_reserve.go
similarity index 100%
rename from vins/ip_reserve.go
rename to pkg/cloudapi/vins/ip_reserve.go
diff --git a/vins/list.go b/pkg/cloudapi/vins/list.go
similarity index 100%
rename from vins/list.go
rename to pkg/cloudapi/vins/list.go
diff --git a/vins/list_deleted.go b/pkg/cloudapi/vins/list_deleted.go
similarity index 100%
rename from vins/list_deleted.go
rename to pkg/cloudapi/vins/list_deleted.go
diff --git a/vins/models.go b/pkg/cloudapi/vins/models.go
similarity index 100%
rename from vins/models.go
rename to pkg/cloudapi/vins/models.go
diff --git a/vins/nat_rule_add.go b/pkg/cloudapi/vins/nat_rule_add.go
similarity index 100%
rename from vins/nat_rule_add.go
rename to pkg/cloudapi/vins/nat_rule_add.go
diff --git a/vins/nat_rule_del.go b/pkg/cloudapi/vins/nat_rule_del.go
similarity index 100%
rename from vins/nat_rule_del.go
rename to pkg/cloudapi/vins/nat_rule_del.go
diff --git a/vins/nat_rule_list.go b/pkg/cloudapi/vins/nat_rule_list.go
similarity index 100%
rename from vins/nat_rule_list.go
rename to pkg/cloudapi/vins/nat_rule_list.go
diff --git a/vins/restore.go b/pkg/cloudapi/vins/restore.go
similarity index 100%
rename from vins/restore.go
rename to pkg/cloudapi/vins/restore.go
diff --git a/vins/search.go b/pkg/cloudapi/vins/search.go
similarity index 100%
rename from vins/search.go
rename to pkg/cloudapi/vins/search.go
diff --git a/vins/vins.go b/pkg/cloudapi/vins/vins.go
similarity index 100%
rename from vins/vins.go
rename to pkg/cloudapi/vins/vins.go
diff --git a/vins/vnfdev_redeploy.go b/pkg/cloudapi/vins/vnfdev_redeploy.go
similarity index 100%
rename from vins/vnfdev_redeploy.go
rename to pkg/cloudapi/vins/vnfdev_redeploy.go
diff --git a/vins/vnfdev_restart.go b/pkg/cloudapi/vins/vnfdev_restart.go
similarity index 100%
rename from vins/vnfdev_restart.go
rename to pkg/cloudapi/vins/vnfdev_restart.go
diff --git a/rg.go b/rg.go
index 554e7bf..7ad9979 100644
--- a/rg.go
+++ b/rg.go
@@ -1,6 +1,6 @@
-package client
+package decortsdk
 
-import "github.com/rudecs/decort-sdk/rg"
+import "github.com/rudecs/decort-sdk/pkg/cloudapi/rg"
 
 func (dc *decortClient) RG() *rg.RG {
 	return rg.New(dc)
diff --git a/sizes.go b/sizes.go
index 8511b91..78c7980 100644
--- a/sizes.go
+++ b/sizes.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/sizes"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/sizes"
 )
 
 func (dc *decortClient) Sizes() *sizes.Sizes {
diff --git a/tasks.go b/tasks.go
index d0a998a..f1ec88e 100644
--- a/tasks.go
+++ b/tasks.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/tasks"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/tasks"
 )
 
 func (dc *decortClient) Tasks() *tasks.Tasks {
diff --git a/vins.go b/vins.go
index 1218406..ac886b0 100644
--- a/vins.go
+++ b/vins.go
@@ -1,7 +1,7 @@
-package client
+package decortsdk
 
 import (
-	"github.com/rudecs/decort-sdk/vins"
+	"github.com/rudecs/decort-sdk/pkg/cloudapi/vins"
 )
 
 func (dc *decortClient) Vins() *vins.Vins {