diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
index ea25d9131f96..7f29843aa55f 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
@@ -161,12 +161,24 @@
     <None Include="ScenarioTests\AzureBackupItemTestCases.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ScenarioTests\AzureBackupPolicyTests.ps1" />
-    <None Include="ScenarioTests\AzureBackupContainerTests.ps1" />
-    <None Include="ScenarioTests\AzureBackupJobTests.ps1" />
-    <None Include="ScenarioTests\AzureBackupVaultTests.ps1" />
-    <None Include="ScenarioTests\BackupItemTests.ps1" />
-    <None Include="ScenarioTests\RecoveryPointTests.ps1" />
+    <None Include="ScenarioTests\AzureBackupPolicyTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="ScenarioTests\AzureBackupContainerTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="ScenarioTests\AzureBackupJobTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="ScenarioTests\AzureBackupVaultTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="ScenarioTests\BackupItemTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="ScenarioTests\RecoveryPointTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\GetAzureBackupContainerTests.json" />
     <None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\RegisterAzureBackupContainerTest.json" />
     <None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\UnregisterAzureBackupContainerTest.json" />
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
index fbe7b1ad1604..3e9c9fa2c9ce 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
@@ -12,8 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using BCI = Microsoft.BackupManagementService.CommonInterface;
-using BMI = Microsoft.BackupManagementService.ManagementInterface;
+using Microsoft.Azure.Commands.AzureBackup.Library;
 using Microsoft.Azure.Management.BackupServices.Models;
 using System;
 using System.Collections.Generic;
@@ -94,12 +93,12 @@ public override void ExecuteCmdlet()
 
         private string ConstructQueryFilterString()
         {
-            BMI.ContainerQueryObject containerQueryObject = new BMI.ContainerQueryObject();
+            ContainerQueryObject containerQueryObject = new ContainerQueryObject();
 
             switch (Type)
             {
                 case AzureBackupContainerTypeInput.AzureVirtualMachine:
-                    containerQueryObject.Type = BCI.ContainerType.IaasVMContainer.ToString();
+                    containerQueryObject.Type = ContainerType.IaasVMContainer.ToString();
                     break;
                 default:
                     break;
@@ -108,10 +107,10 @@ private string ConstructQueryFilterString()
             switch (Status)
             {
                 case AzureBackupContainerStatusInput.Registered:
-                    containerQueryObject.Status = BCI.RegistrationStatus.Registered.ToString();
+                    containerQueryObject.Status = RegistrationStatus.Registered.ToString();
                     break;
                 case AzureBackupContainerStatusInput.Registering:
-                    containerQueryObject.Status = BCI.RegistrationStatus.Registering.ToString();
+                    containerQueryObject.Status = RegistrationStatus.Registering.ToString();
                     break;
                 default:
                     break;
@@ -122,7 +121,7 @@ private string ConstructQueryFilterString()
                 containerQueryObject.FriendlyName = ContainerResourceName;
             }
 
-            return BMI.BackupManagementAPIHelper.GetQueryString(containerQueryObject.GetNameValueCollection());
+            return BackupManagementAPIHelper.GetQueryString(containerQueryObject.GetNameValueCollection());
         }
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
index dceba4b35f53..f9c6e93ec533 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
@@ -55,7 +55,8 @@
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Common">
+    <Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -86,9 +87,13 @@
     <Reference Include="Microsoft.WindowsAzure.Management">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAzure.Management.BackupServicesManagment, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\azure-sdk-for-net\src\ResourceManagement\AzureBackup\BackupServicesManagment\bin\Net45-Debug\Microsoft.WindowsAzure.Management.BackupServicesManagment.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>Cmdlets\VaultCredentials\Microsoft.WindowsAzure.Management.Common.dll</HintPath>
+      <HintPath>Resources\Microsoft.WindowsAzure.Management.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Scheduler">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Scheduler.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Scheduler.dll</HintPath>
@@ -154,6 +159,7 @@
     <Compile Include="Cmdlets\Vault\GetAzureBackupVaultCredentials\VaultCredentials.cs" />
     <Compile Include="Cmdlets\Vault\SetAzureBackupVaultStorageType.cs" />
     <Compile Include="Library\AzureBackupCmdletHelper.cs" />
+    <Compile Include="Library\AzureBackupContainerCmdletHelper.cs" />
     <Compile Include="Models\AzureBackupBaseObjects.cs" />
     <Compile Include="Models\AzureBackupContainer.cs" />
     <Compile Include="Models\AzureBackupEnums.cs" />
@@ -173,10 +179,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\azure-sdk-for-net\src\ResourceManagement\AzureBackup\BackupServicesManagment\BackupServicesManagment.csproj">
-      <Project>{38a6741c-77a3-42a8-a846-83373be57c7f}</Project>
-      <Name>BackupServicesManagment</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
       <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
       <Name>Commands.Common</Name>
@@ -202,8 +204,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\BackupManagementInterface.dll" />
-    <Content Include="Resources\BMSCommonInterface.dll" />
     <Content Include="Resources\Microsoft.WindowsAzure.Management.Common.dll" />
     <Content Include="Resources\Security.Cryptography.dll" />
   </ItemGroup>
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BMSCommonInterface.dll b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BMSCommonInterface.dll
deleted file mode 100644
index adc7d99efcdb..000000000000
Binary files a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BMSCommonInterface.dll and /dev/null differ
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BackupManagementInterface.dll b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BackupManagementInterface.dll
deleted file mode 100644
index 7b6a6c7ee742..000000000000
Binary files a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BackupManagementInterface.dll and /dev/null differ