diff --git a/.gitignore b/.gitignore
index 2e0c2cbe2..f1217928a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .blobs
+.bundle
 .dev_builds
 .final_builds/jobs/**/*.tgz
 .final_builds/packages/**/*.tgz
@@ -9,6 +10,7 @@ config/private.yml
 dev_releases
 releases/*.tgz
 releases/**/*.tgz
+src/bosh_azure_cpi/vendor/cache
 .DS_Store
 .vagrant
 *.swp
diff --git a/packages/bosh_azure_cpi/packaging b/packages/bosh_azure_cpi/packaging
index 05c0c710f..b4f19193c 100644
--- a/packages/bosh_azure_cpi/packaging
+++ b/packages/bosh_azure_cpi/packaging
@@ -4,6 +4,8 @@ BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
 
 cp -a bosh_azure_cpi/* ${BOSH_INSTALL_TARGET}
 
+export BUNDLE_CACHE_PATH="vendor/package"
+export BUNDLE_WITHOUT="development:test"
 bundle_cmd="$BOSH_PACKAGES_DIR/ruby_azure_cpi/bin/bundle"
 
 cd ${BOSH_INSTALL_TARGET}
@@ -11,4 +13,4 @@ cd ${BOSH_INSTALL_TARGET}
 $bundle_cmd install \
   --local           \
   --no-prune        \
-  --deployment
\ No newline at end of file
+  --deployment
diff --git a/packages/bosh_azure_cpi/spec b/packages/bosh_azure_cpi/spec
index 6f8def203..d054032dd 100644
--- a/packages/bosh_azure_cpi/spec
+++ b/packages/bosh_azure_cpi/spec
@@ -3,4 +3,8 @@ name: bosh_azure_cpi
 dependencies:
 - ruby_azure_cpi
 files:
-- bosh_azure_cpi/**/*
\ No newline at end of file
+- bosh_azure_cpi/Gemfile
+- bosh_azure_cpi/Gemfile.lock
+- bosh_azure_cpi/bin/**/*
+- bosh_azure_cpi/lib/**/*
+- bosh_azure_cpi/vendor/package/**/*
diff --git a/src/bosh_azure_cpi/.gitignore b/src/bosh_azure_cpi/.gitignore
deleted file mode 100644
index 06de90aa1..000000000
--- a/src/bosh_azure_cpi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.bundle
\ No newline at end of file
diff --git a/src/bosh_azure_cpi/Gemfile b/src/bosh_azure_cpi/Gemfile
index 519fb46d6..6920b6c3d 100644
--- a/src/bosh_azure_cpi/Gemfile
+++ b/src/bosh_azure_cpi/Gemfile
@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 
-gemspec
+gem 'bosh_common', '1.3215.3.0'
+gem 'bosh_cpi',    '1.3215.3.1'
+gem 'azure',       '~>0.7.4'
+gem 'vhd',         '~>0.0.4'
+gem 'httpclient',  '=2.4.0'
 
 group :development, :test do
   gem 'rspec', '~>3.0.0'
diff --git a/src/bosh_azure_cpi/Gemfile.lock b/src/bosh_azure_cpi/Gemfile.lock
index 2f26b272c..ecdcb5468 100644
--- a/src/bosh_azure_cpi/Gemfile.lock
+++ b/src/bosh_azure_cpi/Gemfile.lock
@@ -1,26 +1,7 @@
-PATH
-  remote: .
-  specs:
-    bosh_azure_cpi (2.0.0)
-      azure (~> 0.7.4)
-      bosh-registry
-      bosh_common
-      bosh_cpi
-      httpclient (= 2.4.0)
-      vhd (~> 0.0.4)
-      yajl-ruby (>= 0.8.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
     addressable (2.3.8)
-    aws-sdk (2.2.35)
-      aws-sdk-resources (= 2.2.35)
-    aws-sdk-core (2.2.35)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.2.35)
-      aws-sdk-core (= 2.2.35)
     azure (0.7.4)
       addressable (~> 2.3)
       azure-core (~> 0.1)
@@ -37,170 +18,22 @@ GEM
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6)
     bit-struct (0.15.0)
-    bosh-registry (1.3215.4.0)
-      aws-sdk
-      bosh_cpi (~> 1.3215.4.0)
-      fog
-      sequel (~> 3.43.0)
-      sinatra (~> 1.4.2)
-      thin (~> 1.5.0)
-      yajl-ruby (~> 1.2.0)
-    bosh_common (1.3215.4.0)
+    bosh_common (1.3215.3.0)
       logging (~> 1.8.2)
       semi_semantic (~> 1.1.0)
-    bosh_cpi (1.3215.4.0)
-      bosh_common (~> 1.3215.4.0)
+    bosh_cpi (1.3215.3.1)
       logging (~> 1.8.2)
       membrane (~> 1.1.0)
-    builder (3.2.2)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    daemons (1.2.3)
     diff-lcs (1.2.5)
-    eventmachine (1.2.0.1)
-    excon (0.49.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.38.0)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-cloudatcost (~> 0.1.0)
-      fog-core (~> 1.32)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-json
-      fog-local
-      fog-openstack
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-rackspace
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-vsphere (>= 0.4.0)
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-    fog-aliyun (0.1.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.9.2)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-cloudatcost (0.1.2)
-      fog-core (~> 1.36)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (1.37.0)
-      builder
-      excon (~> 0.45)
-      formatador (~> 0.2)
-    fog-dynect (0.0.3)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.3.0)
-      fog-core (~> 1.27)
-    fog-openstack (0.1.3)
-      fog-core (>= 1.37)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-rackspace (0.1.1)
-      fog-core (>= 1.35)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-radosgw (0.0.5)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.7.5)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.1.0)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-vsphere (0.6.3)
-      fog-core
-      rbvmomi (~> 1.8)
-    fog-xenserver (0.2.3)
-      fog-core
-      fog-xml
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
     hashdiff (0.2.2)
     httpclient (2.4.0)
-    inflecto (0.0.2)
-    ipaddress (0.8.3)
-    jmespath (1.2.4)
-      json_pure (>= 1.8.1)
     json (1.8.3)
-    json_pure (1.8.3)
     little-plugger (1.1.4)
     logging (1.8.2)
       little-plugger (>= 1.1.3)
@@ -214,14 +47,7 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
     rake (10.3.2)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
@@ -236,19 +62,8 @@ GEM
     rspec-support (3.0.4)
     safe_yaml (1.0.4)
     semi_semantic (1.1.0)
-    sequel (3.43.0)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
     systemu (2.6.5)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.19.1)
-    tilt (2.0.2)
-    trollop (2.1.2)
     uuid (2.3.8)
       macaddr (~> 1.0)
     vhd (0.0.4)
@@ -257,14 +72,19 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    xml-simple (1.1.5)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bosh_azure_cpi!
+  azure (~> 0.7.4)
+  bosh_common (= 1.3215.3.0)
+  bosh_cpi (= 1.3215.3.1)
+  httpclient (= 2.4.0)
   rake (~> 10.3.2)
   rspec (~> 3.0.0)
+  vhd (~> 0.0.4)
   webmock
+
+BUNDLED WITH
+   1.11.2
diff --git a/src/bosh_azure_cpi/bin/azure_cpi b/src/bosh_azure_cpi/bin/azure_cpi
index 7bb87fdd9..9517e1633 100755
--- a/src/bosh_azure_cpi/bin/azure_cpi
+++ b/src/bosh_azure_cpi/bin/azure_cpi
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'yaml'
 require 'ostruct'
@@ -31,4 +32,4 @@ $stdout = STDERR
 
 cli = Bosh::Cpi::Cli.new(cpi_lambda, cpi_log, STDOUT)
 
-cli.run(ARGF.read)
\ No newline at end of file
+cli.run(ARGF.read)
diff --git a/src/bosh_azure_cpi/bin/bosh_azure_console b/src/bosh_azure_cpi/bin/bosh_azure_console
index 662cb0ba2..3b1d68b1c 100755
--- a/src/bosh_azure_cpi/bin/bosh_azure_console
+++ b/src/bosh_azure_cpi/bin/bosh_azure_console
@@ -1,14 +1,5 @@
 #!/usr/bin/env ruby
-
-# Copyright (c) 2009-2012 VMware, Inc.
-
-# Usage example:
-# irb(main):001:0> cpi.create_vm("test",
-#                                "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04-LTS-amd64-server-20140528-en-us-30GB",
-#                                {"instance_type" => "Standard_D1"},
-#                                {"default" => {"type" => "dynamic", "cloud_properties" => {"virtual_network_name"=>"abel-boshvnet", "subnet_name"=>"BOSH"}},
-#                                [],
-#                                {"foo" =>"bar"})
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require "bosh_azure_cpi"
 require "irb"
diff --git a/src/bosh_azure_cpi/bosh_azure_cpi.gemspec b/src/bosh_azure_cpi/bosh_azure_cpi.gemspec
deleted file mode 100644
index 6e8a4fdc6..000000000
--- a/src/bosh_azure_cpi/bosh_azure_cpi.gemspec
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-Gem::Specification.new do |s|
-  s.name          = 'bosh_azure_cpi'
-  s.version       = '2.0.0'
-  s.platform      = Gem::Platform::RUBY
-  s.authors       = ['Nicholas Terry', 'Abel Hu']
-  s.email         = ['nick.i.terry@gmail.com', 'abelch@microsoft.com']
-  s.summary       = 'BOSH Azure CPI'
-  s.description   = 'BOSH Azure CPI'
-  s.homepage      = 'https://github.com/cloudfoundry/bosh'
-  s.license       = 'Apache 2.0'
-  s.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
-
-  s.files         = Dir['README.md', 'lib/**/*', 'scripts/**/*'].select{ |f| File.file? f }
-  s.require_path  = 'lib'
-  s.bindir        = 'bin'
-  s.executables   = %w(azure_cpi bosh_azure_console)
-
-  s.add_dependency 'bosh_common'
-  s.add_dependency 'bosh_cpi'
-  s.add_dependency 'bosh-registry'
-  s.add_dependency 'azure',         '~>0.7.4'
-  s.add_dependency 'vhd',           '~>0.0.4'
-  s.add_dependency 'httpclient',    '=2.4.0'
-  s.add_dependency 'yajl-ruby',     '>=0.8.2'
-end
diff --git a/src/bosh_azure_cpi/lib/cloud/azure.rb b/src/bosh_azure_cpi/lib/cloud/azure.rb
index 4e57a8a5f..b510b116b 100644
--- a/src/bosh_azure_cpi/lib/cloud/azure.rb
+++ b/src/bosh_azure_cpi/lib/cloud/azure.rb
@@ -7,7 +7,7 @@ module AzureCloud; end
 require 'set'
 require 'tmpdir'
 require 'securerandom'
-require 'yajl'
+require 'json'
 require 'digest/md5'
 require 'base64'
 require 'yaml'
@@ -28,7 +28,7 @@ module AzureCloud; end
 require 'common/thread_formatter'
 require 'common/common'
 
-require 'bosh/registry/client'
+require 'bosh/cpi/registry_client'
 
 require 'cloud'
 require 'cloud/azure/helpers'
@@ -52,4 +52,4 @@ module Bosh
   module Clouds
     Azure = Bosh::AzureCloud::Cloud
   end
-end
\ No newline at end of file
+end
diff --git a/src/bosh_azure_cpi/lib/cloud/azure/cloud.rb b/src/bosh_azure_cpi/lib/cloud/azure/cloud.rb
index c4e1aea2b..2704b1b21 100644
--- a/src/bosh_azure_cpi/lib/cloud/azure/cloud.rb
+++ b/src/bosh_azure_cpi/lib/cloud/azure/cloud.rb
@@ -369,7 +369,7 @@ def init_registry
 
       # Registry updates are not really atomic in relation to
       # Azure API calls, so they might get out of sync.
-      @registry = Bosh::Registry::Client.new(registry_endpoint,
+      @registry = Bosh::Cpi::RegistryClient.new(registry_endpoint,
                                              registry_user,
                                              registry_password)
     end
diff --git a/src/bosh_azure_cpi/lib/cloud/azure/network_configurator.rb b/src/bosh_azure_cpi/lib/cloud/azure/network_configurator.rb
index 2846829e7..6b219374e 100644
--- a/src/bosh_azure_cpi/lib/cloud/azure/network_configurator.rb
+++ b/src/bosh_azure_cpi/lib/cloud/azure/network_configurator.rb
@@ -1,9 +1,7 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::AzureCloud
   ##
   # Represents Azure instance network config. Azure VM has single NIC
-  # with dynamic IP address and (optionally) Azure cloud service has a single 
+  # with dynamic IP address and (optionally) Azure cloud service has a single
   # public IP address which VM is not aware of (vip).
   #
   class NetworkConfigurator
diff --git a/src/bosh_azure_cpi/lib/cloud/azure/vm_manager.rb b/src/bosh_azure_cpi/lib/cloud/azure/vm_manager.rb
index 32db5ef55..e31b89a0a 100644
--- a/src/bosh_azure_cpi/lib/cloud/azure/vm_manager.rb
+++ b/src/bosh_azure_cpi/lib/cloud/azure/vm_manager.rb
@@ -169,7 +169,7 @@ def get_user_data(vm_name, dns)
       user_data = {registry: {endpoint: @registry_endpoint}}
       user_data[:server] = {name: vm_name}
       user_data[:dns] = {nameserver: dns} if dns
-      Base64.strict_encode64(Yajl::Encoder.encode(user_data))
+      Base64.strict_encode64(JSON.dump(user_data))
     end
 
     def create_availability_set(avset_params)
diff --git a/src/bosh_azure_cpi/spec/integration/lifecycle_spec.rb b/src/bosh_azure_cpi/spec/integration/lifecycle_spec.rb
index 34b1889a0..f63a0ae99 100644
--- a/src/bosh_azure_cpi/spec/integration/lifecycle_spec.rb
+++ b/src/bosh_azure_cpi/spec/integration/lifecycle_spec.rb
@@ -65,7 +65,7 @@
   before { allow(Bosh::Clouds::Config).to receive_messages(logger: logger) }
   let(:logger) { Logger.new(STDERR) }
 
-  before { allow(Bosh::Registry::Client).to receive_messages(new: double('registry').as_null_object) }
+  before { allow(Bosh::Cpi::RegistryClient).to receive_messages(new: double('registry').as_null_object) }
 
   before { @disk_id = nil }
   after  { cpi.delete_disk(@disk_id) if @disk_id }
@@ -270,7 +270,7 @@
 
   def vm_lifecycle(stemcell_id, network_spec, nums = 1)
     instance_id_pool = Array.new
-    for i in 1..nums 
+    for i in 1..nums
       logger.info("Creating VM with stemcell_id=#{stemcell_id}")
       instance_id = cpi.create_vm(
         SecureRandom.uuid,
@@ -287,7 +287,7 @@ def vm_lifecycle(stemcell_id, network_spec, nums = 1)
       cpi.set_vm_metadata(instance_id, vm_metadata)
 
       cpi.reboot_vm(instance_id)
-      
+
       yield(instance_id) if block_given?
     end
   ensure
diff --git a/src/bosh_azure_cpi/spec/spec_helper.rb b/src/bosh_azure_cpi/spec/spec_helper.rb
index 7d3c17f55..d6fff8e02 100644
--- a/src/bosh_azure_cpi/spec/spec_helper.rb
+++ b/src/bosh_azure_cpi/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
 require 'cloud/azure'
 require 'json'
 require 'net/http'
@@ -18,7 +20,7 @@ def mock_cloud_options
     'properties' => {
       'azure' => {
         'environment' => 'AzureCloud',
-        'subscription_id' => MOCK_AZURE_SUBSCRIPTION_ID, 
+        'subscription_id' => MOCK_AZURE_SUBSCRIPTION_ID,
         'storage_account_name' => MOCK_DEFAULT_STORAGE_ACCOUNT_NAME,
         'resource_group_name' => MOCK_RESOURCE_GROUP_NAME,
         'tenant_id' => MOCK_AZURE_TENANT_ID,
@@ -60,7 +62,7 @@ def mock_registry
     :user     => mock_registry_properties['user'],
     :password => mock_registry_properties['password']
   )
-  allow(Bosh::Registry::Client).to receive(:new).and_return(registry)
+  allow(Bosh::Cpi::RegistryClient).to receive(:new).and_return(registry)
   registry
 end
 
@@ -74,4 +76,3 @@ def mock_cloud(options = nil)
     allow(Bosh::Clouds::Config).to receive(:logger).and_return(logger)
   end
 end
-
diff --git a/src/bosh_azure_cpi/vendor/cache/CFPropertyList-2.3.2.gem b/src/bosh_azure_cpi/vendor/cache/CFPropertyList-2.3.2.gem
deleted file mode 100644
index 3bdd778c0..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/CFPropertyList-2.3.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/aws-sdk-2.2.35.gem b/src/bosh_azure_cpi/vendor/cache/aws-sdk-2.2.35.gem
deleted file mode 100644
index b60e247e6..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/aws-sdk-2.2.35.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/aws-sdk-core-2.2.35.gem b/src/bosh_azure_cpi/vendor/cache/aws-sdk-core-2.2.35.gem
deleted file mode 100644
index 3821c3354..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/aws-sdk-core-2.2.35.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/aws-sdk-resources-2.2.35.gem b/src/bosh_azure_cpi/vendor/cache/aws-sdk-resources-2.2.35.gem
deleted file mode 100644
index 2287dd44e..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/aws-sdk-resources-2.2.35.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/bosh-registry-1.3215.4.0.gem b/src/bosh_azure_cpi/vendor/cache/bosh-registry-1.3215.4.0.gem
deleted file mode 100644
index b67480d87..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/bosh-registry-1.3215.4.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/bosh_common-1.3215.4.0.gem b/src/bosh_azure_cpi/vendor/cache/bosh_common-1.3215.4.0.gem
deleted file mode 100644
index 9a6387525..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/bosh_common-1.3215.4.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/bosh_cpi-1.3215.4.0.gem b/src/bosh_azure_cpi/vendor/cache/bosh_cpi-1.3215.4.0.gem
deleted file mode 100644
index 2a10c2503..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/bosh_cpi-1.3215.4.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/builder-3.2.2.gem b/src/bosh_azure_cpi/vendor/cache/builder-3.2.2.gem
deleted file mode 100644
index b59ef922e..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/builder-3.2.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/crack-0.4.2.gem b/src/bosh_azure_cpi/vendor/cache/crack-0.4.2.gem
deleted file mode 100644
index fdf8e6501..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/crack-0.4.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/daemons-1.2.3.gem b/src/bosh_azure_cpi/vendor/cache/daemons-1.2.3.gem
deleted file mode 100644
index eacd28cd9..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/daemons-1.2.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/diff-lcs-1.2.5.gem b/src/bosh_azure_cpi/vendor/cache/diff-lcs-1.2.5.gem
deleted file mode 100644
index e4436ccc5..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/diff-lcs-1.2.5.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/eventmachine-1.2.0.1.gem b/src/bosh_azure_cpi/vendor/cache/eventmachine-1.2.0.1.gem
deleted file mode 100644
index bd9f37242..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/eventmachine-1.2.0.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/excon-0.49.0.gem b/src/bosh_azure_cpi/vendor/cache/excon-0.49.0.gem
deleted file mode 100644
index ba60dd06c..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/excon-0.49.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fission-0.5.0.gem b/src/bosh_azure_cpi/vendor/cache/fission-0.5.0.gem
deleted file mode 100644
index d505579d1..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fission-0.5.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-1.38.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-1.38.0.gem
deleted file mode 100644
index c4329589e..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-1.38.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-aliyun-0.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-aliyun-0.1.0.gem
deleted file mode 100644
index 5e5f7ec8c..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-aliyun-0.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-atmos-0.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-atmos-0.1.0.gem
deleted file mode 100644
index dcf475e4e..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-atmos-0.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-aws-0.9.2.gem b/src/bosh_azure_cpi/vendor/cache/fog-aws-0.9.2.gem
deleted file mode 100644
index cbef749df..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-aws-0.9.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-brightbox-0.10.1.gem b/src/bosh_azure_cpi/vendor/cache/fog-brightbox-0.10.1.gem
deleted file mode 100644
index 4d28b7450..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-brightbox-0.10.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-cloudatcost-0.1.2.gem b/src/bosh_azure_cpi/vendor/cache/fog-cloudatcost-0.1.2.gem
deleted file mode 100644
index 5b3cbd444..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-cloudatcost-0.1.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-core-1.37.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-core-1.37.0.gem
deleted file mode 100644
index ede67313e..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-core-1.37.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-dynect-0.0.3.gem b/src/bosh_azure_cpi/vendor/cache/fog-dynect-0.0.3.gem
deleted file mode 100644
index 2e290705b..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-dynect-0.0.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-ecloud-0.3.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-ecloud-0.3.0.gem
deleted file mode 100644
index 3fa133405..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-ecloud-0.3.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-google-0.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-google-0.1.0.gem
deleted file mode 100644
index 25b2d7131..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-google-0.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-json-1.0.2.gem b/src/bosh_azure_cpi/vendor/cache/fog-json-1.0.2.gem
deleted file mode 100644
index 49cb88992..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-json-1.0.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-local-0.3.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-local-0.3.0.gem
deleted file mode 100644
index fedbc65d3..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-local-0.3.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-openstack-0.1.3.gem b/src/bosh_azure_cpi/vendor/cache/fog-openstack-0.1.3.gem
deleted file mode 100644
index fc424641a..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-openstack-0.1.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-powerdns-0.1.1.gem b/src/bosh_azure_cpi/vendor/cache/fog-powerdns-0.1.1.gem
deleted file mode 100644
index 43ed450e4..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-powerdns-0.1.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-profitbricks-0.0.5.gem b/src/bosh_azure_cpi/vendor/cache/fog-profitbricks-0.0.5.gem
deleted file mode 100644
index bc6b9f0bd..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-profitbricks-0.0.5.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-rackspace-0.1.1.gem b/src/bosh_azure_cpi/vendor/cache/fog-rackspace-0.1.1.gem
deleted file mode 100644
index 8f20b7e34..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-rackspace-0.1.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-radosgw-0.0.5.gem b/src/bosh_azure_cpi/vendor/cache/fog-radosgw-0.0.5.gem
deleted file mode 100644
index b1353cd13..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-radosgw-0.0.5.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-riakcs-0.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-riakcs-0.1.0.gem
deleted file mode 100644
index 7aad98337..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-riakcs-0.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-sakuracloud-1.7.5.gem b/src/bosh_azure_cpi/vendor/cache/fog-sakuracloud-1.7.5.gem
deleted file mode 100644
index 6a8e47314..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-sakuracloud-1.7.5.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-serverlove-0.1.2.gem b/src/bosh_azure_cpi/vendor/cache/fog-serverlove-0.1.2.gem
deleted file mode 100644
index 8d71b8270..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-serverlove-0.1.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-softlayer-1.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-softlayer-1.1.0.gem
deleted file mode 100644
index 4141e55a9..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-softlayer-1.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-storm_on_demand-0.1.1.gem b/src/bosh_azure_cpi/vendor/cache/fog-storm_on_demand-0.1.1.gem
deleted file mode 100644
index dc738ae76..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-storm_on_demand-0.1.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-terremark-0.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-terremark-0.1.0.gem
deleted file mode 100644
index 175e74384..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-terremark-0.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-vmfusion-0.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-vmfusion-0.1.0.gem
deleted file mode 100644
index 0dc0607f4..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-vmfusion-0.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-voxel-0.1.0.gem b/src/bosh_azure_cpi/vendor/cache/fog-voxel-0.1.0.gem
deleted file mode 100644
index 219b82d63..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-voxel-0.1.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-vsphere-0.6.3.gem b/src/bosh_azure_cpi/vendor/cache/fog-vsphere-0.6.3.gem
deleted file mode 100644
index fde045044..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-vsphere-0.6.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-xenserver-0.2.3.gem b/src/bosh_azure_cpi/vendor/cache/fog-xenserver-0.2.3.gem
deleted file mode 100644
index 82e346306..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-xenserver-0.2.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/fog-xml-0.1.2.gem b/src/bosh_azure_cpi/vendor/cache/fog-xml-0.1.2.gem
deleted file mode 100644
index 56bb22a01..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/fog-xml-0.1.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/formatador-0.2.5.gem b/src/bosh_azure_cpi/vendor/cache/formatador-0.2.5.gem
deleted file mode 100644
index 0e1cfaa98..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/formatador-0.2.5.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/hashdiff-0.2.2.gem b/src/bosh_azure_cpi/vendor/cache/hashdiff-0.2.2.gem
deleted file mode 100644
index 89e4d614b..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/hashdiff-0.2.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/inflecto-0.0.2.gem b/src/bosh_azure_cpi/vendor/cache/inflecto-0.0.2.gem
deleted file mode 100644
index cd62d32ea..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/inflecto-0.0.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/ipaddress-0.8.3.gem b/src/bosh_azure_cpi/vendor/cache/ipaddress-0.8.3.gem
deleted file mode 100644
index c8aea8855..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/ipaddress-0.8.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/jmespath-1.2.4.gem b/src/bosh_azure_cpi/vendor/cache/jmespath-1.2.4.gem
deleted file mode 100644
index 40bed0dc4..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/jmespath-1.2.4.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/json_pure-1.8.3.gem b/src/bosh_azure_cpi/vendor/cache/json_pure-1.8.3.gem
deleted file mode 100644
index 287ac3770..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/json_pure-1.8.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rack-1.6.4.gem b/src/bosh_azure_cpi/vendor/cache/rack-1.6.4.gem
deleted file mode 100644
index 6d06fed8e..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rack-1.6.4.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rack-protection-1.5.3.gem b/src/bosh_azure_cpi/vendor/cache/rack-protection-1.5.3.gem
deleted file mode 100644
index 5a00e8e9a..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rack-protection-1.5.3.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rake-10.3.2.gem b/src/bosh_azure_cpi/vendor/cache/rake-10.3.2.gem
deleted file mode 100644
index 59f5fb634..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rake-10.3.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rbvmomi-1.8.2.gem b/src/bosh_azure_cpi/vendor/cache/rbvmomi-1.8.2.gem
deleted file mode 100644
index f8249ec23..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rbvmomi-1.8.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rspec-3.0.0.gem b/src/bosh_azure_cpi/vendor/cache/rspec-3.0.0.gem
deleted file mode 100644
index 28e57f844..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rspec-3.0.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rspec-core-3.0.4.gem b/src/bosh_azure_cpi/vendor/cache/rspec-core-3.0.4.gem
deleted file mode 100644
index 4c1de8b28..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rspec-core-3.0.4.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rspec-expectations-3.0.4.gem b/src/bosh_azure_cpi/vendor/cache/rspec-expectations-3.0.4.gem
deleted file mode 100644
index d49831b33..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rspec-expectations-3.0.4.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rspec-mocks-3.0.4.gem b/src/bosh_azure_cpi/vendor/cache/rspec-mocks-3.0.4.gem
deleted file mode 100644
index e9f09169e..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rspec-mocks-3.0.4.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/rspec-support-3.0.4.gem b/src/bosh_azure_cpi/vendor/cache/rspec-support-3.0.4.gem
deleted file mode 100644
index 769f7cead..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/rspec-support-3.0.4.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/safe_yaml-1.0.4.gem b/src/bosh_azure_cpi/vendor/cache/safe_yaml-1.0.4.gem
deleted file mode 100644
index 7da49f5e6..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/safe_yaml-1.0.4.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/sequel-3.43.0.gem b/src/bosh_azure_cpi/vendor/cache/sequel-3.43.0.gem
deleted file mode 100644
index 5b3f368e3..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/sequel-3.43.0.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/sinatra-1.4.7.gem b/src/bosh_azure_cpi/vendor/cache/sinatra-1.4.7.gem
deleted file mode 100644
index f73498a31..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/sinatra-1.4.7.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/thin-1.5.1.gem b/src/bosh_azure_cpi/vendor/cache/thin-1.5.1.gem
deleted file mode 100644
index b9d000b22..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/thin-1.5.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/tilt-2.0.2.gem b/src/bosh_azure_cpi/vendor/cache/tilt-2.0.2.gem
deleted file mode 100644
index d74ae7f9b..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/tilt-2.0.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/trollop-2.1.2.gem b/src/bosh_azure_cpi/vendor/cache/trollop-2.1.2.gem
deleted file mode 100644
index 5e4072723..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/trollop-2.1.2.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/webmock-1.22.1.gem b/src/bosh_azure_cpi/vendor/cache/webmock-1.22.1.gem
deleted file mode 100644
index 91298a5d4..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/webmock-1.22.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/xml-simple-1.1.5.gem b/src/bosh_azure_cpi/vendor/cache/xml-simple-1.1.5.gem
deleted file mode 100644
index 0cd0fa095..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/xml-simple-1.1.5.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/yajl-ruby-1.2.1.gem b/src/bosh_azure_cpi/vendor/cache/yajl-ruby-1.2.1.gem
deleted file mode 100644
index 1d70c76bc..000000000
Binary files a/src/bosh_azure_cpi/vendor/cache/yajl-ruby-1.2.1.gem and /dev/null differ
diff --git a/src/bosh_azure_cpi/vendor/cache/addressable-2.3.8.gem b/src/bosh_azure_cpi/vendor/package/addressable-2.3.8.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/addressable-2.3.8.gem
rename to src/bosh_azure_cpi/vendor/package/addressable-2.3.8.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/azure-0.7.4.gem b/src/bosh_azure_cpi/vendor/package/azure-0.7.4.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/azure-0.7.4.gem
rename to src/bosh_azure_cpi/vendor/package/azure-0.7.4.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/azure-core-0.1.1.gem b/src/bosh_azure_cpi/vendor/package/azure-core-0.1.1.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/azure-core-0.1.1.gem
rename to src/bosh_azure_cpi/vendor/package/azure-core-0.1.1.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/bit-struct-0.15.0.gem b/src/bosh_azure_cpi/vendor/package/bit-struct-0.15.0.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/bit-struct-0.15.0.gem
rename to src/bosh_azure_cpi/vendor/package/bit-struct-0.15.0.gem
diff --git a/src/bosh_azure_cpi/vendor/package/bosh_common-1.3215.3.0.gem b/src/bosh_azure_cpi/vendor/package/bosh_common-1.3215.3.0.gem
new file mode 100644
index 000000000..8e9119bb3
Binary files /dev/null and b/src/bosh_azure_cpi/vendor/package/bosh_common-1.3215.3.0.gem differ
diff --git a/src/bosh_azure_cpi/vendor/package/bosh_cpi-1.3215.3.1.gem b/src/bosh_azure_cpi/vendor/package/bosh_cpi-1.3215.3.1.gem
new file mode 100644
index 000000000..9af0ff325
Binary files /dev/null and b/src/bosh_azure_cpi/vendor/package/bosh_cpi-1.3215.3.1.gem differ
diff --git a/src/bosh_azure_cpi/vendor/cache/faraday-0.9.2.gem b/src/bosh_azure_cpi/vendor/package/faraday-0.9.2.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/faraday-0.9.2.gem
rename to src/bosh_azure_cpi/vendor/package/faraday-0.9.2.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/faraday_middleware-0.10.0.gem b/src/bosh_azure_cpi/vendor/package/faraday_middleware-0.10.0.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/faraday_middleware-0.10.0.gem
rename to src/bosh_azure_cpi/vendor/package/faraday_middleware-0.10.0.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/httpclient-2.4.0.gem b/src/bosh_azure_cpi/vendor/package/httpclient-2.4.0.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/httpclient-2.4.0.gem
rename to src/bosh_azure_cpi/vendor/package/httpclient-2.4.0.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/json-1.8.3.gem b/src/bosh_azure_cpi/vendor/package/json-1.8.3.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/json-1.8.3.gem
rename to src/bosh_azure_cpi/vendor/package/json-1.8.3.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/little-plugger-1.1.4.gem b/src/bosh_azure_cpi/vendor/package/little-plugger-1.1.4.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/little-plugger-1.1.4.gem
rename to src/bosh_azure_cpi/vendor/package/little-plugger-1.1.4.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/logging-1.8.2.gem b/src/bosh_azure_cpi/vendor/package/logging-1.8.2.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/logging-1.8.2.gem
rename to src/bosh_azure_cpi/vendor/package/logging-1.8.2.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/macaddr-1.7.1.gem b/src/bosh_azure_cpi/vendor/package/macaddr-1.7.1.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/macaddr-1.7.1.gem
rename to src/bosh_azure_cpi/vendor/package/macaddr-1.7.1.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/membrane-1.1.0.gem b/src/bosh_azure_cpi/vendor/package/membrane-1.1.0.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/membrane-1.1.0.gem
rename to src/bosh_azure_cpi/vendor/package/membrane-1.1.0.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/mime-types-2.99.1.gem b/src/bosh_azure_cpi/vendor/package/mime-types-2.99.1.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/mime-types-2.99.1.gem
rename to src/bosh_azure_cpi/vendor/package/mime-types-2.99.1.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/mini_portile2-2.0.0.gem b/src/bosh_azure_cpi/vendor/package/mini_portile2-2.0.0.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/mini_portile2-2.0.0.gem
rename to src/bosh_azure_cpi/vendor/package/mini_portile2-2.0.0.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/multi_json-1.11.2.gem b/src/bosh_azure_cpi/vendor/package/multi_json-1.11.2.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/multi_json-1.11.2.gem
rename to src/bosh_azure_cpi/vendor/package/multi_json-1.11.2.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/multipart-post-2.0.0.gem b/src/bosh_azure_cpi/vendor/package/multipart-post-2.0.0.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/multipart-post-2.0.0.gem
rename to src/bosh_azure_cpi/vendor/package/multipart-post-2.0.0.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/nokogiri-1.6.7.2.gem b/src/bosh_azure_cpi/vendor/package/nokogiri-1.6.7.2.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/nokogiri-1.6.7.2.gem
rename to src/bosh_azure_cpi/vendor/package/nokogiri-1.6.7.2.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/semi_semantic-1.1.0.gem b/src/bosh_azure_cpi/vendor/package/semi_semantic-1.1.0.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/semi_semantic-1.1.0.gem
rename to src/bosh_azure_cpi/vendor/package/semi_semantic-1.1.0.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/systemu-2.6.5.gem b/src/bosh_azure_cpi/vendor/package/systemu-2.6.5.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/systemu-2.6.5.gem
rename to src/bosh_azure_cpi/vendor/package/systemu-2.6.5.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/thor-0.19.1.gem b/src/bosh_azure_cpi/vendor/package/thor-0.19.1.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/thor-0.19.1.gem
rename to src/bosh_azure_cpi/vendor/package/thor-0.19.1.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/uuid-2.3.8.gem b/src/bosh_azure_cpi/vendor/package/uuid-2.3.8.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/uuid-2.3.8.gem
rename to src/bosh_azure_cpi/vendor/package/uuid-2.3.8.gem
diff --git a/src/bosh_azure_cpi/vendor/cache/vhd-0.0.4.gem b/src/bosh_azure_cpi/vendor/package/vhd-0.0.4.gem
similarity index 100%
rename from src/bosh_azure_cpi/vendor/cache/vhd-0.0.4.gem
rename to src/bosh_azure_cpi/vendor/package/vhd-0.0.4.gem
diff --git a/src/bosh_azure_cpi/vendor_gems b/src/bosh_azure_cpi/vendor_gems
index 0a881fc13..781f2bdf5 100755
--- a/src/bosh_azure_cpi/vendor_gems
+++ b/src/bosh_azure_cpi/vendor_gems
@@ -7,9 +7,9 @@ if [ -z ${TMPDIR+x} ]; then
 fi
 
 export BUNDLE_APP_CONFIG=$(mktemp -d $TMPDIR/bundler_config_XXXXXX)
-export BUNDLE_CACHE_PATH="vendor/cache"
+export BUNDLE_CACHE_PATH="vendor/package"
 export BUNDLE_WITHOUT="development:test"
 
 bundle package
 
-rm -rf $BUNDLE_APP_CONFIG
\ No newline at end of file
+rm -rf $BUNDLE_APP_CONFIG