diff --git a/.travis.yml b/.travis.yml
index 54a3909ac983..faf1cfe4bd75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: go
 go: tip
-script: go test -v ./azure/...
+script:
+    - go test -v ./storage/...
+    - go build -v ./management/...
diff --git a/azure/client.go b/management/client.go
similarity index 98%
rename from azure/client.go
rename to management/client.go
index 37475e2706d8..9c040d7c1705 100644
--- a/azure/client.go
+++ b/management/client.go
@@ -1,4 +1,4 @@
-package azure
+package management
 
 import (
 	"encoding/xml"
diff --git a/azure/hostedservice/client.go b/management/hostedservice/client.go
similarity index 95%
rename from azure/hostedservice/client.go
rename to management/hostedservice/client.go
index a4ed6094f4f3..0aa6570625e7 100644
--- a/azure/hostedservice/client.go
+++ b/management/hostedservice/client.go
@@ -5,8 +5,8 @@ import (
 	"encoding/xml"
 	"fmt"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
-	locationclient "github.com/MSOpenTech/azure-sdk-for-go/azure/location"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
+	locationclient "github.com/MSOpenTech/azure-sdk-for-go/management/location"
 )
 
 const (
@@ -23,7 +23,7 @@ const (
 )
 
 //NewClient is used to return a handle to the HostedService API
-func NewClient(client azure.Client) HostedServiceClient {
+func NewClient(client management.Client) HostedServiceClient {
 	return HostedServiceClient{client: client}
 }
 
diff --git a/azure/hostedservice/entities.go b/management/hostedservice/entities.go
similarity index 93%
rename from azure/hostedservice/entities.go
rename to management/hostedservice/entities.go
index a0fc4870b5f0..43fe79ba6e91 100644
--- a/azure/hostedservice/entities.go
+++ b/management/hostedservice/entities.go
@@ -3,12 +3,12 @@ package hostedservice
 import (
 	"encoding/xml"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 //HostedServiceClient is used to manage operations on Azure Hosted Services
 type HostedServiceClient struct {
-	client azure.Client
+	client management.Client
 }
 
 type CreateHostedService struct {
diff --git a/azure/http.go b/management/http.go
similarity index 99%
rename from azure/http.go
rename to management/http.go
index 32912b058f56..d9f1753670bb 100644
--- a/azure/http.go
+++ b/management/http.go
@@ -1,4 +1,4 @@
-package azure
+package management
 
 import (
 	"bytes"
diff --git a/azure/location/client.go b/management/location/client.go
similarity index 93%
rename from azure/location/client.go
rename to management/location/client.go
index 8612ac7128a8..18a7bc54bfc9 100644
--- a/azure/location/client.go
+++ b/management/location/client.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 const (
@@ -15,7 +15,7 @@ const (
 )
 
 //NewClient is used to instantiate a new LocationClient from an Azure client
-func NewClient(client azure.Client) LocationClient {
+func NewClient(client management.Client) LocationClient {
 	return LocationClient{client: client}
 }
 
diff --git a/azure/location/entities.go b/management/location/entities.go
similarity index 91%
rename from azure/location/entities.go
rename to management/location/entities.go
index 52fdfb0d0e4c..40683c5113c6 100644
--- a/azure/location/entities.go
+++ b/management/location/entities.go
@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 //LocationClient is used to manage operations on Azure Locations
 type LocationClient struct {
-	client azure.Client
+	client management.Client
 }
 
 type LocationList struct {
diff --git a/azure/operations.go b/management/operations.go
similarity index 98%
rename from azure/operations.go
rename to management/operations.go
index 6220a1768640..26182389804d 100644
--- a/azure/operations.go
+++ b/management/operations.go
@@ -1,4 +1,4 @@
-package azure
+package management
 
 import (
 	"encoding/xml"
diff --git a/azure/publishSettings.go b/management/publishSettings.go
similarity index 99%
rename from azure/publishSettings.go
rename to management/publishSettings.go
index 17e10ae64029..efb8fb666a8c 100644
--- a/azure/publishSettings.go
+++ b/management/publishSettings.go
@@ -1,4 +1,4 @@
-package azure
+package management
 
 import (
 	"encoding/base64"
diff --git a/azure/storageservice/client.go b/management/storageservice/client.go
similarity index 96%
rename from azure/storageservice/client.go
rename to management/storageservice/client.go
index 45abb4af498b..0a50872745de 100644
--- a/azure/storageservice/client.go
+++ b/management/storageservice/client.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 const (
@@ -21,7 +21,7 @@ const (
 )
 
 //NewClient is used to instantiate a new StorageServiceClient from an Azure client
-func NewClient(self azure.Client) StorageServiceClient {
+func NewClient(self management.Client) StorageServiceClient {
 	return StorageServiceClient{client: self}
 }
 
diff --git a/azure/storageservice/entities.go b/management/storageservice/entities.go
similarity index 94%
rename from azure/storageservice/entities.go
rename to management/storageservice/entities.go
index ad3f2c93dba9..d324b65b976d 100644
--- a/azure/storageservice/entities.go
+++ b/management/storageservice/entities.go
@@ -3,12 +3,12 @@ package storageservice
 import (
 	"encoding/xml"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 //StorageServiceClient is used to manage operations on Azure Storage
 type StorageServiceClient struct {
-	client azure.Client
+	client management.Client
 }
 
 type StorageServiceList struct {
diff --git a/azure/util.go b/management/util.go
similarity index 97%
rename from azure/util.go
rename to management/util.go
index d8b0c6ab12de..3ae1ec529492 100644
--- a/azure/util.go
+++ b/management/util.go
@@ -1,4 +1,4 @@
-package azure
+package management
 
 import (
 	"bytes"
diff --git a/azure/virtualmachine/client.go b/management/virtualmachine/client.go
similarity index 98%
rename from azure/virtualmachine/client.go
rename to management/virtualmachine/client.go
index fca37523c9bb..4463562cb3ad 100644
--- a/azure/virtualmachine/client.go
+++ b/management/virtualmachine/client.go
@@ -16,11 +16,11 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
-	hostedserviceclient "github.com/MSOpenTech/azure-sdk-for-go/azure/hostedservice"
-	locationclient "github.com/MSOpenTech/azure-sdk-for-go/azure/location"
-	storageserviceclient "github.com/MSOpenTech/azure-sdk-for-go/azure/storageservice"
-	imageclient "github.com/MSOpenTech/azure-sdk-for-go/azure/virtualmachineimage"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
+	hostedserviceclient "github.com/MSOpenTech/azure-sdk-for-go/management/hostedservice"
+	locationclient "github.com/MSOpenTech/azure-sdk-for-go/management/location"
+	storageserviceclient "github.com/MSOpenTech/azure-sdk-for-go/management/storageservice"
+	imageclient "github.com/MSOpenTech/azure-sdk-for-go/management/virtualmachineimage"
 )
 
 const (
@@ -52,7 +52,7 @@ const (
 )
 
 //NewClient is used to instantiate a new VmClient from an Azure client
-func NewClient(client azure.Client) VirtualMachineClient {
+func NewClient(client management.Client) VirtualMachineClient {
 	return VirtualMachineClient{client: client}
 }
 
diff --git a/azure/virtualmachine/entities.go b/management/virtualmachine/entities.go
similarity index 98%
rename from azure/virtualmachine/entities.go
rename to management/virtualmachine/entities.go
index a2a924342009..a92529223548 100644
--- a/azure/virtualmachine/entities.go
+++ b/management/virtualmachine/entities.go
@@ -3,12 +3,12 @@ package virtualmachine
 import (
 	"encoding/xml"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 //VmClient is used to manage operations on Azure Virtual Machines
 type VirtualMachineClient struct {
-	client azure.Client
+	client management.Client
 }
 
 type VMDeployment struct {
diff --git a/azure/virtualmachinedisk/client.go b/management/virtualmachinedisk/client.go
similarity index 85%
rename from azure/virtualmachinedisk/client.go
rename to management/virtualmachinedisk/client.go
index 9d681f07cebf..1461e43b78a1 100644
--- a/azure/virtualmachinedisk/client.go
+++ b/management/virtualmachinedisk/client.go
@@ -3,7 +3,7 @@ package virtualmachinedisk
 import (
 	"fmt"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 const (
@@ -12,7 +12,7 @@ const (
 )
 
 //NewClient is used to instantiate a new DiskClient from an Azure client
-func NewClient(client azure.Client) DiskClient {
+func NewClient(client management.Client) DiskClient {
 	return DiskClient{client: client}
 }
 
diff --git a/azure/virtualmachinedisk/entities.go b/management/virtualmachinedisk/entities.go
similarity index 57%
rename from azure/virtualmachinedisk/entities.go
rename to management/virtualmachinedisk/entities.go
index 843c5a63e787..ebf23fcf6330 100644
--- a/azure/virtualmachinedisk/entities.go
+++ b/management/virtualmachinedisk/entities.go
@@ -1,8 +1,8 @@
 package virtualmachinedisk
 
-import "github.com/MSOpenTech/azure-sdk-for-go/azure"
+import "github.com/MSOpenTech/azure-sdk-for-go/management"
 
 //DiskClient is used to manage operations on Azure Disks
 type DiskClient struct {
-	client azure.Client
+	client management.Client
 }
diff --git a/azure/virtualmachineimage/client.go b/management/virtualmachineimage/client.go
similarity index 91%
rename from azure/virtualmachineimage/client.go
rename to management/virtualmachineimage/client.go
index 951c9197b210..9f5aaab4e810 100644
--- a/azure/virtualmachineimage/client.go
+++ b/management/virtualmachineimage/client.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 const (
@@ -15,7 +15,7 @@ const (
 )
 
 //NewClient is used to instantiate a new ImageClient from an Azure client
-func NewClient(client azure.Client) ImageClient {
+func NewClient(client management.Client) ImageClient {
 	return ImageClient{client: client}
 }
 
diff --git a/azure/virtualmachineimage/entities.go b/management/virtualmachineimage/entities.go
similarity index 86%
rename from azure/virtualmachineimage/entities.go
rename to management/virtualmachineimage/entities.go
index a38e8656d328..43805d524c37 100644
--- a/azure/virtualmachineimage/entities.go
+++ b/management/virtualmachineimage/entities.go
@@ -3,12 +3,12 @@ package virtualmachineimage
 import (
 	"encoding/xml"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 //ImageClient is used to manage operations on Azure Locations
 type ImageClient struct {
-	client azure.Client
+	client management.Client
 }
 
 type ImageList struct {
diff --git a/azure/virtualnetwork/client.go b/management/virtualnetwork/client.go
similarity index 93%
rename from azure/virtualnetwork/client.go
rename to management/virtualnetwork/client.go
index d0c62516e7f6..66404f4300a1 100644
--- a/azure/virtualnetwork/client.go
+++ b/management/virtualnetwork/client.go
@@ -3,7 +3,7 @@ package virtualnetwork
 import (
 	"encoding/xml"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 const (
@@ -11,7 +11,7 @@ const (
 )
 
 //VnetClient is used to return a handle to the VnetClient API
-func NewClient(client azure.Client) VirtualNetworkClient {
+func NewClient(client management.Client) VirtualNetworkClient {
 	return VirtualNetworkClient{client: client}
 }
 
diff --git a/azure/virtualnetwork/entities.go b/management/virtualnetwork/entities.go
similarity index 97%
rename from azure/virtualnetwork/entities.go
rename to management/virtualnetwork/entities.go
index 34b1d9c1a7b6..75fd7f3083db 100644
--- a/azure/virtualnetwork/entities.go
+++ b/management/virtualnetwork/entities.go
@@ -3,7 +3,7 @@ package virtualnetwork
 import (
 	"encoding/xml"
 
-	"github.com/MSOpenTech/azure-sdk-for-go/azure"
+	"github.com/MSOpenTech/azure-sdk-for-go/management"
 )
 
 const xmlNamespace = "http://schemas.microsoft.com/ServiceHosting/2011/07/NetworkConfiguration"
@@ -12,7 +12,7 @@ const xmlNamespaceXsi = "http://www.w3.org/2001/XMLSchema-instance"
 
 //VnetClient is used to manage operations on Azure Virtual Networks
 type VirtualNetworkClient struct {
-	client azure.Client
+	client management.Client
 }
 
 //NetworkConfiguration represents the network configuration for an entire Azure
diff --git a/azure/storage/blob.go b/storage/blob.go
similarity index 100%
rename from azure/storage/blob.go
rename to storage/blob.go
diff --git a/azure/storage/blob_test.go b/storage/blob_test.go
similarity index 100%
rename from azure/storage/blob_test.go
rename to storage/blob_test.go
diff --git a/azure/storage/client.go b/storage/client.go
similarity index 100%
rename from azure/storage/client.go
rename to storage/client.go
diff --git a/azure/storage/client_test.go b/storage/client_test.go
similarity index 100%
rename from azure/storage/client_test.go
rename to storage/client_test.go
diff --git a/azure/storage/util.go b/storage/util.go
similarity index 100%
rename from azure/storage/util.go
rename to storage/util.go
diff --git a/azure/storage/util_test.go b/storage/util_test.go
similarity index 100%
rename from azure/storage/util_test.go
rename to storage/util_test.go