diff --git a/BUILD b/BUILD
index 6ebc094a083e1264add69ec200a0aaf0a1de9055..a7bcd013982ac1e9b732925a7ced30dc4f6c008c 100644
--- a/BUILD
+++ b/BUILD
@@ -796,9 +796,9 @@ cc_library(
     "src/cpp/server/dynamic_thread_pool.h",
     "src/cpp/server/thread_pool_interface.h",
     "src/cpp/client/secure_credentials.cc",
-    "src/cpp/codegen/core_codegen.cc",
-    "src/cpp/codegen/grpc_library.cc",
     "src/cpp/common/auth_property_iterator.cc",
+    "src/cpp/common/core_codegen.cc",
+    "src/cpp/common/grpc_library.cc",
     "src/cpp/common/secure_auth_context.cc",
     "src/cpp/common/secure_channel_arguments.cc",
     "src/cpp/common/secure_create_auth_context.cc",
diff --git a/Makefile b/Makefile
index e9a31b2e29ed39b7ffd9b7df77342562695058bc..f2713c100de5ada437ca0fbc7bf6d799667192b2 100644
--- a/Makefile
+++ b/Makefile
@@ -3014,9 +3014,9 @@ endif
 
 LIBGRPC++_SRC = \
     src/cpp/client/secure_credentials.cc \
-    src/cpp/codegen/core_codegen.cc \
-    src/cpp/codegen/grpc_library.cc \
     src/cpp/common/auth_property_iterator.cc \
+    src/cpp/common/core_codegen.cc \
+    src/cpp/common/grpc_library.cc \
     src/cpp/common/secure_auth_context.cc \
     src/cpp/common/secure_channel_arguments.cc \
     src/cpp/common/secure_create_auth_context.cc \
@@ -13147,9 +13147,9 @@ src/core/tsi/fake_transport_security.c: $(OPENSSL_DEP)
 src/core/tsi/ssl_transport_security.c: $(OPENSSL_DEP)
 src/core/tsi/transport_security.c: $(OPENSSL_DEP)
 src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP)
-src/cpp/codegen/core_codegen.cc: $(OPENSSL_DEP)
-src/cpp/codegen/grpc_library.cc: $(OPENSSL_DEP)
 src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP)
+src/cpp/common/core_codegen.cc: $(OPENSSL_DEP)
+src/cpp/common/grpc_library.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_channel_arguments.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_create_auth_context.cc: $(OPENSSL_DEP)
diff --git a/build.yaml b/build.yaml
index a53da04fee0790c2e9ca875353f122ffc7875d27..5323915bb6f8475c046d832a3f8e893c71204af0 100644
--- a/build.yaml
+++ b/build.yaml
@@ -695,9 +695,9 @@ libs:
   - src/cpp/server/secure_server_credentials.h
   src:
   - src/cpp/client/secure_credentials.cc
-  - src/cpp/codegen/core_codegen.cc
-  - src/cpp/codegen/grpc_library.cc
   - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/core_codegen.cc
+  - src/cpp/common/grpc_library.cc
   - src/cpp/common/secure_auth_context.cc
   - src/cpp/common/secure_channel_arguments.cc
   - src/cpp/common/secure_create_auth_context.cc
diff --git a/include/grpc++/impl/grpc_library.h b/include/grpc++/impl/grpc_library.h
index 207053e63b7c96f73d633c1114809acef59c883c..9d32ec152ffa7c621079e209d07d83114bedde99 100644
--- a/include/grpc++/impl/grpc_library.h
+++ b/include/grpc++/impl/grpc_library.h
@@ -40,7 +40,7 @@
 #include <grpc++/impl/codegen/grpc_library.h>
 #include <grpc/grpc.h>
 
-#include "src/cpp/codegen/core_codegen.h"
+#include "src/cpp/common/core_codegen.h"
 
 namespace grpc {
 
diff --git a/src/cpp/codegen/core_codegen.cc b/src/cpp/common/core_codegen.cc
similarity index 98%
rename from src/cpp/codegen/core_codegen.cc
rename to src/cpp/common/core_codegen.cc
index b052cc60eb934073ea5cf1229cc266bdb346c7e6..0f7028f34c1185dd2973c12838fb2b0bb7d8d8aa 100644
--- a/src/cpp/codegen/core_codegen.cc
+++ b/src/cpp/common/core_codegen.cc
@@ -31,7 +31,7 @@
  *
  */
 
-#include "src/cpp/codegen/core_codegen.h"
+#include "src/cpp/common/core_codegen.h"
 
 #include <stdlib.h>
 
@@ -48,8 +48,6 @@
 
 #include "src/core/profiling/timers.h"
 
-grpc::CoreCodegenInterface* grpc::g_core_codegen_interface = nullptr;
-
 namespace {
 
 const int kGrpcBufferWriterMaxBufferLength = 8192;
diff --git a/src/cpp/codegen/core_codegen.h b/src/cpp/common/core_codegen.h
similarity index 100%
rename from src/cpp/codegen/core_codegen.h
rename to src/cpp/common/core_codegen.h
diff --git a/src/cpp/codegen/grpc_library.cc b/src/cpp/common/grpc_library.cc
similarity index 93%
rename from src/cpp/codegen/grpc_library.cc
rename to src/cpp/common/grpc_library.cc
index 48acec3f3d1ceecd346af69cdfab6ccebbbeb459..445a76e9ae9195da163a2cf94f548dd15bfc6f9a 100644
--- a/src/cpp/codegen/grpc_library.cc
+++ b/src/cpp/common/grpc_library.cc
@@ -32,9 +32,11 @@
  */
 
 #include <grpc++/impl/codegen/grpc_library.h>
+#include <grpc++/impl/codegen/core_codegen_interface.h>
 
 namespace grpc {
 
 GrpcLibraryInterface *g_glip = nullptr;
+CoreCodegenInterface *g_core_codegen_interface = nullptr;
 
 }  // namespace grpc
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index e63c9ae696e3fddd3094359082093a4a36e9f823..6a41c801df21cbe73a4425c37f28660c9deb6bed 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -812,9 +812,9 @@ src/cpp/common/create_auth_context.h \
 src/cpp/server/dynamic_thread_pool.h \
 src/cpp/server/thread_pool_interface.h \
 src/cpp/client/secure_credentials.cc \
-src/cpp/codegen/core_codegen.cc \
-src/cpp/codegen/grpc_library.cc \
 src/cpp/common/auth_property_iterator.cc \
+src/cpp/common/core_codegen.cc \
+src/cpp/common/grpc_library.cc \
 src/cpp/common/secure_auth_context.cc \
 src/cpp/common/secure_channel_arguments.cc \
 src/cpp/common/secure_create_auth_context.cc \
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index a17f60d8f21f1bcc67ca812ec240a5449593e01d..491af56c84d9cf2c5e85ee47ad8bbc30c6010e25 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -5036,12 +5036,12 @@
       "src/cpp/client/insecure_credentials.cc", 
       "src/cpp/client/secure_credentials.cc", 
       "src/cpp/client/secure_credentials.h", 
-      "src/cpp/codegen/core_codegen.cc", 
-      "src/cpp/codegen/grpc_library.cc", 
       "src/cpp/common/auth_property_iterator.cc", 
       "src/cpp/common/channel_arguments.cc", 
       "src/cpp/common/completion_queue.cc", 
+      "src/cpp/common/core_codegen.cc", 
       "src/cpp/common/create_auth_context.h", 
+      "src/cpp/common/grpc_library.cc", 
       "src/cpp/common/rpc_method.cc", 
       "src/cpp/common/secure_auth_context.cc", 
       "src/cpp/common/secure_auth_context.h", 
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
index be7e91f4a5e3f0684c2b19ebc9c38063c4fecac0..374bbfca1bf2a6a205892b73cc78a2b2fe84b82b 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@@ -315,11 +315,11 @@
   <ItemGroup>
     <ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\core_codegen.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\core_codegen.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\grpc_library.cc">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.cc">
     </ClCompile>
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
index f0e10b10a7705b0b525bfa5847fab0210384c214..5cb395a6689d5438866b74ca9b5a2cf2856e1179 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@@ -4,13 +4,13 @@
     <ClCompile Include="$(SolutionDir)\..\src\cpp\client\secure_credentials.cc">
       <Filter>src\cpp\client</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\core_codegen.cc">
-      <Filter>src\cpp\codegen</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
+      <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\codegen\grpc_library.cc">
-      <Filter>src\cpp\codegen</Filter>
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\core_codegen.cc">
+      <Filter>src\cpp\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\auth_property_iterator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\cpp\common\grpc_library.cc">
       <Filter>src\cpp\common</Filter>
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\cpp\common\secure_auth_context.cc">
@@ -281,9 +281,6 @@
     <Filter Include="src\cpp\client">
       <UniqueIdentifier>{7febf32a-d7a6-76fa-9e17-f189f591c062}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\cpp\codegen">
-      <UniqueIdentifier>{3c3e27f4-d3d9-3c42-5204-08b5e839f2de}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\cpp\common">
       <UniqueIdentifier>{2336e396-7e0b-8bf9-3b09-adc6ad1f0e5b}</UniqueIdentifier>
     </Filter>