diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index a906511457f..9e96e1332c6 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -10,7 +10,6 @@ jobs:
         - common:parallel
         - core:parallel
         - dev:parallel
-        - director-core:parallel
         - monitor:parallel
         - nats-sync:parallel
         - template:parallel
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 49c6c3d813f..9e42cd36b98 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -9,7 +9,6 @@ groups:
       - unit-common
       - unit-core
       - unit-dev
-      - unit-director-core
       - unit-monitor
       - unit-nats-sync
       - unit-template
@@ -61,7 +60,6 @@ jobs:
       - unit-common
       - unit-core
       - unit-dev
-      - unit-director-core
       - unit-monitor
       - unit-nats-sync
       - unit-template
@@ -127,23 +125,6 @@ jobs:
       params:
         RAKE_TASK: spec:unit:dev
 
-  - name: unit-director-core
-    public: true
-    serial: true
-    serial_groups: [unit-director-core]
-    build_logs_to_retain: 250
-    plan:
-    - get: bosh-src
-      trigger: true
-      passed: [gate]
-    - get: integration-image
-    - task: test-rake-task
-      timeout: 2h
-      file: bosh-src/ci/tasks/test-rake-task.yml
-      image: integration-image
-      params:
-        RAKE_TASK: spec:unit:director-core
-
   - name: unit-monitor
     public: true
     serial: true
@@ -423,7 +404,6 @@ jobs:
       - unit-common
       - unit-core
       - unit-dev
-      - unit-director-core
       - unit-monitor
       - unit-nats-sync
       - unit-template
diff --git a/packages/director/spec b/packages/director/spec
index 5b607b63bd6..02a8d63de6f 100644
--- a/packages/director/spec
+++ b/packages/director/spec
@@ -10,7 +10,6 @@ files:
 - bosh-director/**/*
 - bosh_common/**/*
 - bosh-core/**/*
-- bosh-director-core/**/*
 - bosh-template/**/*
 - vendor/cache/*.gem
 - vendor/cache/extensions/**
diff --git a/scripts/rsync-bbl b/scripts/rsync-bbl
index 2f37a39d92b..4fbca66badd 100755
--- a/scripts/rsync-bbl
+++ b/scripts/rsync-bbl
@@ -39,7 +39,6 @@ main() {
   do-rsync bosh-director db
   do-rsync bosh-director lib
   do-rsync bosh-core lib
-  do-rsync bosh-director-core lib
   do-rsync bosh-template bin
   do-rsync bosh-template lib
 
diff --git a/scripts/rsync-vbox b/scripts/rsync-vbox
index bd733aea9f5..bec55c71264 100755
--- a/scripts/rsync-vbox
+++ b/scripts/rsync-vbox
@@ -29,7 +29,6 @@ main() {
   do-rsync bosh-director db director
   do-rsync bosh-director lib director
   do-rsync bosh-core lib director
-  do-rsync bosh-director-core lib director
   do-rsync bosh-template bin director
   do-rsync bosh-template lib director
   do-rsync bosh-monitor lib health_monitor
diff --git a/src/Gemfile b/src/Gemfile
index 6b1d7e7abfe..175888c5733 100644
--- a/src/Gemfile
+++ b/src/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'bosh-core', path: 'bosh-core'
 gem 'bosh-director', path: 'bosh-director'
-gem 'bosh-director-core', path: 'bosh-director-core'
 gem 'bosh-monitor', path: 'bosh-monitor'
 gem 'bosh-nats-sync', path: 'bosh-nats-sync'
 gem 'bosh-template', path: 'bosh-template'
diff --git a/src/Gemfile.lock b/src/Gemfile.lock
index 0627e8ef956..913d73ed342 100644
--- a/src/Gemfile.lock
+++ b/src/Gemfile.lock
@@ -16,22 +16,12 @@ PATH
       logging
       openssl
 
-PATH
-  remote: bosh-director-core
-  specs:
-    bosh-director-core (0.0.0)
-      bosh-template (~> 0.0.0)
-      bosh_common (~> 0.0.0)
-      openssl
-      securerandom
-
 PATH
   remote: bosh-director
   specs:
     bosh-director (0.0.0)
       bcrypt
       bosh-core (~> 0.0.0)
-      bosh-director-core (~> 0.0.0)
       bosh-template (~> 0.0.0)
       bosh_common (~> 0.0.0)
       bosh_cpi
@@ -368,7 +358,6 @@ DEPENDENCIES
   bosh-core!
   bosh-dev!
   bosh-director!
-  bosh-director-core!
   bosh-monitor!
   bosh-nats-sync!
   bosh-template!
diff --git a/src/bosh-director-core/.gitignore b/src/bosh-director-core/.gitignore
deleted file mode 100644
index b844b143d22..00000000000
--- a/src/bosh-director-core/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Gemfile.lock
diff --git a/src/bosh-director-core/bosh-director-core.gemspec b/src/bosh-director-core/bosh-director-core.gemspec
deleted file mode 100644
index bb4713ebf7f..00000000000
--- a/src/bosh-director-core/bosh-director-core.gemspec
+++ /dev/null
@@ -1,31 +0,0 @@
-# coding: utf-8
-require File.expand_path('../lib/bosh/director/core/version', __FILE__)
-
-Gem::Specification.new do |spec|
-  spec.name        = 'bosh-director-core'
-  spec.version     = Bosh::Director::Core::VERSION
-  spec.platform    = Gem::Platform::RUBY
-  spec.description = 'BOSH director-core'
-  spec.summary     = 'BOSH director-core common code for Director and Microbosh Deployer'
-
-  spec.authors     = ['Cloud Foundry']
-  spec.email       = ['support@cloudfoundry.com']
-  spec.homepage    = 'https://github.com/cloudfoundry/bosh'
-  spec.license     = 'Apache-2.0'
-  spec.required_ruby_version = '>= 3.0.0'
-
-  spec.files         = Dir['lib/**/*'].select { |f| File.file?(f) }
-  spec.test_files    = Dir['spec/**/*'].select { |f| File.file?(f) }
-
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'bosh_common', "~>#{Bosh::Director::Core::VERSION}"
-  spec.add_dependency 'bosh-template', "~>#{Bosh::Director::Core::VERSION}"
-  spec.add_dependency 'openssl'
-  spec.add_dependency 'securerandom'
-
-  spec.add_development_dependency 'fakefs'
-  spec.add_development_dependency 'minitar'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'simplecov'
-end
diff --git a/src/bosh-director-core/spec/gemspec_spec.rb b/src/bosh-director-core/spec/gemspec_spec.rb
deleted file mode 100644
index 0e135eaa146..00000000000
--- a/src/bosh-director-core/spec/gemspec_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-require 'rubygems/package'
-
-module Bosh::Director::Core
-  describe 'gem' do
-    let(:name) { 'bosh-director-core' }
-    let(:spec) { Gem::Specification.load "#{name}.gemspec" }
-
-    it 'validates' do
-      Gem::DefaultUserInteraction.use_ui(Gem::SilentUI.new) do
-        expect(spec.validate).to be_truthy
-      end
-    end
-  end
-end
diff --git a/src/bosh-director-core/spec/spec_helper.rb b/src/bosh-director-core/spec/spec_helper.rb
deleted file mode 100644
index a1ee8bc4d81..00000000000
--- a/src/bosh-director-core/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.expand_path('../../../spec/shared/spec_helper', __FILE__)
diff --git a/src/bosh-director/bosh-director.gemspec b/src/bosh-director/bosh-director.gemspec
index 5959c54bc04..100b3ec69b3 100644
--- a/src/bosh-director/bosh-director.gemspec
+++ b/src/bosh-director/bosh-director.gemspec
@@ -35,10 +35,9 @@ Gem::Specification.new do |spec|
   # external CPIs, in order to ensure appropriate versions are installed.
   # Also do the same in bosh_cli_plugin_micro.gemspec
   # Review this once CPIs are completely externalized and "micro" goes away.
-  spec.add_dependency 'bosh_common',        "~>#{Bosh::Director::VERSION}"
-  spec.add_dependency 'bosh-core',          "~>#{Bosh::Director::VERSION}"
-  spec.add_dependency 'bosh-director-core', "~>#{Bosh::Director::VERSION}"
-  spec.add_dependency 'bosh-template',      "~>#{Bosh::Director::VERSION}"
+  spec.add_dependency 'bosh_common',   "~>#{Bosh::Director::VERSION}"
+  spec.add_dependency 'bosh-core',     "~>#{Bosh::Director::VERSION}"
+  spec.add_dependency 'bosh-template', "~>#{Bosh::Director::VERSION}"
 
   spec.add_dependency 'bcrypt'
   spec.add_dependency 'bosh_cpi'
diff --git a/src/bosh-director-core/lib/bosh/director/core.rb b/src/bosh-director/lib/bosh/director/core.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core.rb
rename to src/bosh-director/lib/bosh/director/core.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/tar_gzipper.rb b/src/bosh-director/lib/bosh/director/core/tar_gzipper.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/tar_gzipper.rb
rename to src/bosh-director/lib/bosh/director/core/tar_gzipper.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates.rb b/src/bosh-director/lib/bosh/director/core/templates.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates.rb
rename to src/bosh-director/lib/bosh/director/core/templates.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/compressed_rendered_job_templates.rb b/src/bosh-director/lib/bosh/director/core/templates/compressed_rendered_job_templates.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/compressed_rendered_job_templates.rb
rename to src/bosh-director/lib/bosh/director/core/templates/compressed_rendered_job_templates.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/job_instance_renderer.rb b/src/bosh-director/lib/bosh/director/core/templates/job_instance_renderer.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/job_instance_renderer.rb
rename to src/bosh-director/lib/bosh/director/core/templates/job_instance_renderer.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/job_template_loader.rb b/src/bosh-director/lib/bosh/director/core/templates/job_template_loader.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/job_template_loader.rb
rename to src/bosh-director/lib/bosh/director/core/templates/job_template_loader.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/job_template_renderer.rb b/src/bosh-director/lib/bosh/director/core/templates/job_template_renderer.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/job_template_renderer.rb
rename to src/bosh-director/lib/bosh/director/core/templates/job_template_renderer.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_file_template.rb b/src/bosh-director/lib/bosh/director/core/templates/rendered_file_template.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/rendered_file_template.rb
rename to src/bosh-director/lib/bosh/director/core/templates/rendered_file_template.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_instance.rb b/src/bosh-director/lib/bosh/director/core/templates/rendered_job_instance.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_instance.rb
rename to src/bosh-director/lib/bosh/director/core/templates/rendered_job_instance.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_template.rb b/src/bosh-director/lib/bosh/director/core/templates/rendered_job_template.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/rendered_job_template.rb
rename to src/bosh-director/lib/bosh/director/core/templates/rendered_job_template.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_archive.rb b/src/bosh-director/lib/bosh/director/core/templates/rendered_templates_archive.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_archive.rb
rename to src/bosh-director/lib/bosh/director/core/templates/rendered_templates_archive.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper.rb b/src/bosh-director/lib/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper.rb
rename to src/bosh-director/lib/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_writer.rb b/src/bosh-director/lib/bosh/director/core/templates/rendered_templates_writer.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/rendered_templates_writer.rb
rename to src/bosh-director/lib/bosh/director/core/templates/rendered_templates_writer.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/source_erb.rb b/src/bosh-director/lib/bosh/director/core/templates/source_erb.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/source_erb.rb
rename to src/bosh-director/lib/bosh/director/core/templates/source_erb.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/templates/template_blob_cache.rb b/src/bosh-director/lib/bosh/director/core/templates/template_blob_cache.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/templates/template_blob_cache.rb
rename to src/bosh-director/lib/bosh/director/core/templates/template_blob_cache.rb
diff --git a/src/bosh-director-core/lib/bosh/director/core/version.rb b/src/bosh-director/lib/bosh/director/core/version.rb
similarity index 100%
rename from src/bosh-director-core/lib/bosh/director/core/version.rb
rename to src/bosh-director/lib/bosh/director/core/version.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/tar_gzipper_spec.rb b/src/bosh-director/spec/unit/core/tar_gzipper_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/tar_gzipper_spec.rb
rename to src/bosh-director/spec/unit/core/tar_gzipper_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/compressed_rendered_job_templates_spec.rb b/src/bosh-director/spec/unit/core/templates/compressed_rendered_job_templates_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/compressed_rendered_job_templates_spec.rb
rename to src/bosh-director/spec/unit/core/templates/compressed_rendered_job_templates_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/job_instance_renderer_spec.rb b/src/bosh-director/spec/unit/core/templates/job_instance_renderer_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/job_instance_renderer_spec.rb
rename to src/bosh-director/spec/unit/core/templates/job_instance_renderer_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/job_template_loader_spec.rb b/src/bosh-director/spec/unit/core/templates/job_template_loader_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/job_template_loader_spec.rb
rename to src/bosh-director/spec/unit/core/templates/job_template_loader_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/job_template_renderer_spec.rb b/src/bosh-director/spec/unit/core/templates/job_template_renderer_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/job_template_renderer_spec.rb
rename to src/bosh-director/spec/unit/core/templates/job_template_renderer_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_instance_spec.rb b/src/bosh-director/spec/unit/core/templates/rendered_job_instance_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_instance_spec.rb
rename to src/bosh-director/spec/unit/core/templates/rendered_job_instance_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_template_spec.rb b/src/bosh-director/spec/unit/core/templates/rendered_job_template_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/rendered_job_template_spec.rb
rename to src/bosh-director/spec/unit/core/templates/rendered_job_template_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_archive_spec.rb b/src/bosh-director/spec/unit/core/templates/rendered_templates_archive_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_archive_spec.rb
rename to src/bosh-director/spec/unit/core/templates/rendered_templates_archive_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper_spec.rb b/src/bosh-director/spec/unit/core/templates/rendered_templates_in_memory_tar_gzipper_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_in_memory_tar_gzipper_spec.rb
rename to src/bosh-director/spec/unit/core/templates/rendered_templates_in_memory_tar_gzipper_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_writer_spec.rb b/src/bosh-director/spec/unit/core/templates/rendered_templates_writer_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/rendered_templates_writer_spec.rb
rename to src/bosh-director/spec/unit/core/templates/rendered_templates_writer_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/source_erb_spec.rb b/src/bosh-director/spec/unit/core/templates/source_erb_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/source_erb_spec.rb
rename to src/bosh-director/spec/unit/core/templates/source_erb_spec.rb
diff --git a/src/bosh-director-core/spec/bosh/director/core/templates/template_blob_cache_spec.rb b/src/bosh-director/spec/unit/core/templates/template_blob_cache_spec.rb
similarity index 100%
rename from src/bosh-director-core/spec/bosh/director/core/templates/template_blob_cache_spec.rb
rename to src/bosh-director/spec/unit/core/templates/template_blob_cache_spec.rb