diff --git a/sdk/python/kfp/compiler/__init__.py b/sdk/python/kfp/compiler/__init__.py
index f397748ebaa2..716aaf612174 100644
--- a/sdk/python/kfp/compiler/__init__.py
+++ b/sdk/python/kfp/compiler/__init__.py
@@ -14,4 +14,4 @@
 
 
 from .compiler import Compiler
-from ._component_builder import build_python_component, build_docker_image, VersionedDependency
\ No newline at end of file
+from ..containers._component_builder import build_python_component, build_docker_image, VersionedDependency
\ No newline at end of file
diff --git a/sdk/python/kfp/containers/_build_image_api.py b/sdk/python/kfp/containers/_build_image_api.py
index 349a2d761fe9..34b8355fe3bb 100644
--- a/sdk/python/kfp/containers/_build_image_api.py
+++ b/sdk/python/kfp/containers/_build_image_api.py
@@ -25,7 +25,7 @@
 
 import requests
 
-from ..compiler._container_builder import ContainerBuilder
+from ._container_builder import ContainerBuilder
 
 
 default_base_image = 'gcr.io/deeplearning-platform-release/tf-cpu.1-14'
@@ -40,7 +40,6 @@
 def _get_default_image_builder():
     global _default_image_builder
     if _default_image_builder is None:
-        from ..compiler._container_builder import ContainerBuilder
         _default_image_builder = ContainerBuilder()
     return _default_image_builder
 
diff --git a/sdk/python/kfp/compiler/_component_builder.py b/sdk/python/kfp/containers/_component_builder.py
similarity index 100%
rename from sdk/python/kfp/compiler/_component_builder.py
rename to sdk/python/kfp/containers/_component_builder.py
diff --git a/sdk/python/kfp/compiler/_container_builder.py b/sdk/python/kfp/containers/_container_builder.py
similarity index 100%
rename from sdk/python/kfp/compiler/_container_builder.py
rename to sdk/python/kfp/containers/_container_builder.py
diff --git a/sdk/python/kfp/compiler/_gcs_helper.py b/sdk/python/kfp/containers/_gcs_helper.py
similarity index 100%
rename from sdk/python/kfp/compiler/_gcs_helper.py
rename to sdk/python/kfp/containers/_gcs_helper.py
diff --git a/sdk/python/tests/compiler/component_builder_test.py b/sdk/python/tests/compiler/component_builder_test.py
index 8d928755e9d0..583e3dc89a93 100644
--- a/sdk/python/tests/compiler/component_builder_test.py
+++ b/sdk/python/tests/compiler/component_builder_test.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from kfp.compiler._component_builder import _generate_dockerfile
-from kfp.compiler._component_builder import _dependency_to_requirements
-from kfp.compiler._component_builder import VersionedDependency
-from kfp.compiler._component_builder import DependencyHelper
+from kfp.containers._component_builder import _generate_dockerfile
+from kfp.containers._component_builder import _dependency_to_requirements
+from kfp.containers._component_builder import VersionedDependency
+from kfp.containers._component_builder import DependencyHelper
 
 import os
 import unittest
@@ -113,7 +113,7 @@ def test_add_python_package(self):
 class TestGenerator(unittest.TestCase):
   def test_generate_dockerfile(self):
     """ Test generate dockerfile """
-    from kfp.compiler._component_builder import _generate_dockerfile
+    from kfp.containers._component_builder import _generate_dockerfile
 
     # prepare
     test_data_dir = os.path.join(os.path.dirname(__file__), 'testdata')
diff --git a/sdk/python/tests/compiler/container_builder_test.py b/sdk/python/tests/compiler/container_builder_test.py
index 3bf7509bb498..e03a80c1ca12 100644
--- a/sdk/python/tests/compiler/container_builder_test.py
+++ b/sdk/python/tests/compiler/container_builder_test.py
@@ -18,12 +18,12 @@
 import yaml
 import tempfile
 import mock
-from kfp.compiler._component_builder import ContainerBuilder
+from kfp.containers._component_builder import ContainerBuilder
 
 GCS_BASE = 'gs://kfp-testing/'
 GCR_IMAGE_TAG = 'gcr.io/kfp-testing/image'
 
-@mock.patch('kfp.compiler._gcs_helper.GCSHelper')
+@mock.patch('kfp.containers._gcs_helper.GCSHelper')
 class TestContainerBuild(unittest.TestCase):
 
   def test_wrap_dir_in_tarball(self, mock_gcshelper):
diff --git a/test/sample-test/sample_test_launcher.py b/test/sample-test/sample_test_launcher.py
index fa519c6f9c0c..ef06d2271e97 100644
--- a/test/sample-test/sample_test_launcher.py
+++ b/test/sample-test/sample_test_launcher.py
@@ -27,7 +27,7 @@
 
 from constants import PAPERMILL_ERR_MSG, BASE_DIR, TEST_DIR, SCHEMA_CONFIG, CONFIG_DIR, DEFAULT_CONFIG
 from check_notebook_results import NoteBookChecker
-from kfp.compiler._gcs_helper import GCSHelper
+from kfp.containers._gcs_helper import GCSHelper
 from run_sample_test import PySampleChecker