diff --git a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj
index 39197d7f485a..a20ccde885ba 100644
--- a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj
+++ b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.Netcore.csproj
@@ -36,19 +36,19 @@
   <ItemGroup>
     <PreLoadAssemblies Include="$(ProjectDir)..\..\..\lib\Newtonsoft.Json.9.dll"/>
     <PreLoadAssemblies Include="$(ProjectDir)..\..\..\lib\Newtonsoft.Json.10.dll"/>
-    <PreLoadAssemblies Include="$(ProjectDir)..\..\..\lib\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
-    <PreLoadAssemblies Include="$(ProjectDir)..\..\..\lib\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
+    <PreLoadAssemblies Include="$(ProjectDir)..\..\..\lib\Microsoft.IdentityModel.Clients.ActiveDirectory\3.14.0\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
+    <PreLoadAssemblies Include="$(ProjectDir)..\..\..\lib\Microsoft.IdentityModel.Clients.ActiveDirectory\3.14.0\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
   </ItemGroup>
 
   <ItemGroup>
-    <NetCoreAssemblies Include="$(ProjectDir)..\..\..\lib\netcore\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
-    <NetCoreAssemblies Include="$(ProjectDir)..\..\..\lib\netcore\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
+    <NetCoreAssemblies Include="$(ProjectDir)..\..\..\lib\Microsoft.IdentityModel.Clients.ActiveDirectory\3.19.2\Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
+    <NetCoreAssemblies Include="$(ProjectDir)..\..\..\lib\Microsoft.IdentityModel.Clients.ActiveDirectory\3.19.2\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
   </ItemGroup>
 
 
   <ItemGroup>
-    <StorageDependencies Include="$(ProjectDir)..\..\..\lib\Microsoft.WindowsAzure.Storage.dll"/>
-    <StorageDependencies Include="$(ProjectDir)..\..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll"/>
+    <StorageDependencies Include="$(ProjectDir)..\..\..\lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.dll"/>
+    <StorageDependencies Include="$(ProjectDir)..\..\..\lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.DataMovement.dll"/>
   </ItemGroup>
 
 
diff --git a/src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll b/src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.14.0/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll
similarity index 100%
rename from src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll
rename to src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.14.0/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll
diff --git a/src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory.dll b/src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.14.0/Microsoft.IdentityModel.Clients.ActiveDirectory.dll
similarity index 100%
rename from src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory.dll
rename to src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.14.0/Microsoft.IdentityModel.Clients.ActiveDirectory.dll
diff --git a/src/lib/netcore/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll b/src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.19.2/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll
similarity index 100%
rename from src/lib/netcore/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll
rename to src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.19.2/Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll
diff --git a/src/lib/netcore/Microsoft.IdentityModel.Clients.ActiveDirectory.dll b/src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.19.2/Microsoft.IdentityModel.Clients.ActiveDirectory.dll
similarity index 100%
rename from src/lib/netcore/Microsoft.IdentityModel.Clients.ActiveDirectory.dll
rename to src/lib/Microsoft.IdentityModel.Clients.ActiveDirectory/3.19.2/Microsoft.IdentityModel.Clients.ActiveDirectory.dll
diff --git a/src/lib/Microsoft.WindowsAzure.Storage.DataMovement.dll b/src/lib/WindowsAzure.Storage/9.3.0/Microsoft.WindowsAzure.Storage.DataMovement.dll
similarity index 100%
rename from src/lib/Microsoft.WindowsAzure.Storage.DataMovement.dll
rename to src/lib/WindowsAzure.Storage/9.3.0/Microsoft.WindowsAzure.Storage.DataMovement.dll
diff --git a/src/lib/Microsoft.WindowsAzure.Storage.dll b/src/lib/WindowsAzure.Storage/9.3.0/Microsoft.WindowsAzure.Storage.dll
similarity index 100%
rename from src/lib/Microsoft.WindowsAzure.Storage.dll
rename to src/lib/WindowsAzure.Storage/9.3.0/Microsoft.WindowsAzure.Storage.dll
diff --git a/tools/AzureRM.Example.psm1 b/tools/AzureRM.Example.psm1
index 3bdddfd73214..edb9a3c13bdc 100644
--- a/tools/AzureRM.Example.psm1
+++ b/tools/AzureRM.Example.psm1
@@ -15,7 +15,7 @@ if($PSEdition -eq 'Desktop' -and (Test-Path $preloadPath))
     try 
     {
         Get-ChildItem -Path $preloadPath -Filter "*.dll" | ForEach-Object {  
-            Add-Type -Path $_.FullName | Out-Null
+            Add-Type -Path $_.FullName -ErrorAction Ignore | Out-Null
         }
     }
     catch {}
@@ -32,7 +32,7 @@ if($PSEdition -eq 'Core' -and (Test-Path $netCorePath))
             $matches = ($loadedAssemblies | Where-Object {$_.Name -eq $assemblyName.Name})
             if (-not $matches)
             {
-                Add-Type -Path $_.FullName | Out-Null
+                Add-Type -Path $_.FullName -ErrorAction Ignore | Out-Null
             }
         }
     }