diff --git a/bundle-workflow/python/build.py b/bundle-workflow/python/build.py
index a020261ee2..9634b95243 100755
--- a/bundle-workflow/python/build.py
+++ b/bundle-workflow/python/build.py
@@ -11,8 +11,8 @@
 from manifests.input_manifest import InputManifest
 from build_workflow.build_recorder import BuildRecorder
 from build_workflow.builder import Builder
-from build_workflow.git_repository import GitRepository
 from paths.script_finder import ScriptFinder
+from git.git_repository import GitRepository
 
 parser = argparse.ArgumentParser(description = "Build an OpenSearch Bundle")
 parser.add_argument('manifest', type = argparse.FileType('r'), help="Manifest file.")
diff --git a/bundle-workflow/python/build_workflow/git_repository.py b/bundle-workflow/python/git/git_repository.py
similarity index 100%
rename from bundle-workflow/python/build_workflow/git_repository.py
rename to bundle-workflow/python/git/git_repository.py
diff --git a/bundle-workflow/python/test.py b/bundle-workflow/python/test.py
index c593efadea..b200c81c4f 100755
--- a/bundle-workflow/python/test.py
+++ b/bundle-workflow/python/test.py
@@ -4,9 +4,9 @@
 import tempfile
 import argparse
 from manifests.bundle_manifest import BundleManifest
+from git.git_repository import GitRepository
 from test_workflow.test_cluster import LocalTestCluster
-from test_workflow.git import GitRepository
-from test_workflow.integ_test import IntegTestSuite
+from test_workflow.integ_test_suite import IntegTestSuite
 
 parser = argparse.ArgumentParser(description = "Test an OpenSearch Bundle")
 parser.add_argument('manifest', type = argparse.FileType('r'), help="Manifest file.")
@@ -21,10 +21,10 @@
     cluster = LocalTestCluster(manifest.bundle_location)
 
     # For each component, check out the git repo and run `integtest.sh`
-    for component in manifest.components():
-        print(component.name())
-        repo = GitRepository(component.repository_url(), component.commit_id())
-        test_suite = IntegTestSuite(component.name(), repo)
+    for component in manifest.components:
+        print(component.name)
+        repo = GitRepository(component.repository_url, component.commit_id)
+        test_suite = IntegTestSuite(component.name, repo)
         test_suite.execute(cluster)
 
     cluster.destroy()
diff --git a/bundle-workflow/python/test_workflow/git.py b/bundle-workflow/python/test_workflow/git.py
deleted file mode 100644
index 76016c6cd1..0000000000
--- a/bundle-workflow/python/test_workflow/git.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import subprocess
-import tempfile
-
-class GitRepository:
-    def __init__(self, url, ref):
-        self._url = url
-        self._dir = tempfile.TemporaryDirectory()
-        self.execute(f'git init')
-        self.execute(f'git remote add origin {url}')
-        self.execute(f'git fetch --depth 1 origin {ref}')
-        self.execute(f'git checkout {ref}')
-        print(f'Checked out {url}@{ref} into {self._dir.name}')
-
-    def dir(self):
-        return self._dir.name
-
-    def execute(self, command):
-        print(f'Executing "{command}" in {self._dir.name}')
-        subprocess.check_call(command, shell=True, cwd=self._dir.name)
diff --git a/bundle-workflow/python/test_workflow/integ_test.py b/bundle-workflow/python/test_workflow/integ_test.py
deleted file mode 100644
index 0135dcec04..0000000000
--- a/bundle-workflow/python/test_workflow/integ_test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import os
-
-class IntegTestSuite:
-    def __init__(self, name, repo):
-        self._name = name
-        self._repo = repo
-
-    def execute(self, cluster):
-        script = self._repo.dir() + "/integtest.sh"
-        if (os.path.exists(script)):
-            repo.execute(f'sh integtest.sh -b {cluster.endpoint()} -p {cluster.port()}')
-        else:
-            print(f'{script} does not exist. Skipping integ tests for {self._name}')
diff --git a/bundle-workflow/python/test_workflow/integ_test_suite.py b/bundle-workflow/python/test_workflow/integ_test_suite.py
new file mode 100644
index 0000000000..8e5883d717
--- /dev/null
+++ b/bundle-workflow/python/test_workflow/integ_test_suite.py
@@ -0,0 +1,14 @@
+import os
+
+class IntegTestSuite:
+    def __init__(self, name, repo):
+        self.name = name
+        self.repo = repo
+
+    def execute(self, cluster):
+        script = self.repo.dir.name + "/integtest.sh"
+        if (os.path.exists(script)):
+            print(f'sh integtest.sh -b {cluster.endpoint()} -p {cluster.port()}')
+#            repo.execute(f'sh integtest.sh -b {cluster.endpoint()} -p {cluster.port()}')
+        else:
+            print(f'{script} does not exist. Skipping integ tests for {self.name}')