diff --git a/bazel/labgrid/executor/BUILD.bazel b/bazel/labgrid/executor/BUILD.bazel
new file mode 100644
index 0000000000000000000000000000000000000000..6a2605c3b60e077fb3dc3681460a2a0359352500
--- /dev/null
+++ b/bazel/labgrid/executor/BUILD.bazel
@@ -0,0 +1,5 @@
+py_library(
+    name = "executor",
+    srcs = ["manager.py"],
+    visibility = ["//visibility:public"],
+)
\ No newline at end of file
diff --git a/labgrid/executor/manager.py b/bazel/labgrid/executor/manager.py
similarity index 100%
rename from labgrid/executor/manager.py
rename to bazel/labgrid/executor/manager.py
diff --git a/e2e/docker/manager.py b/e2e/docker/manager.py
index cca44f05f35c9ace1eaa2ca58ba93bdb4fb053e0..192ab9dfb35c6d6d12e1966f37180feffd4cb358 100644
--- a/e2e/docker/manager.py
+++ b/e2e/docker/manager.py
@@ -5,7 +5,7 @@ from typing import Iterator
 
 from python.runfiles import Runfiles
 
-from labgrid.executor.manager import Data, Manager
+from bazel.labgrid.executor.manager import Data, Manager
 
 
 @contextmanager
diff --git a/e2e/remote/manager.py b/e2e/remote/manager.py
index 7c460b08e8e037546026044134b4f00a4574b8e8..26fed975906ba0e14689281d5f54943d6dfc1c17 100644
--- a/e2e/remote/manager.py
+++ b/e2e/remote/manager.py
@@ -8,7 +8,7 @@ from typing import Iterator
 from python.runfiles import Runfiles
 from remote.lock import lock
 
-from labgrid.executor.manager import Data, Manager
+from bazel.labgrid.executor.manager import Data, Manager
 
 
 @contextmanager
diff --git a/labgrid/executor/BUILD.bazel b/labgrid/executor/BUILD.bazel
index b75b764d4fb96ee5fa53e11e8bd0be8646585ce8..bb36de9b00294db6741c1296a814909ca0fb9b4a 100644
--- a/labgrid/executor/BUILD.bazel
+++ b/labgrid/executor/BUILD.bazel
@@ -6,12 +6,16 @@ exports_files(
     visibility = ["//visibility:public"],
 )
 
+
+
 py_library(
     name = "manager",
-    srcs = ["manager.py"],
+    deps = ["//bazel/labgrid/executor"],
     visibility = ["//visibility:public"],
 )
 
+
+
 py_binary(
     name = "executor",
     srcs = ["executor.py"],
diff --git a/labgrid/executor/executor.py b/labgrid/executor/executor.py
index 0bc77bf9a819ee67c64c03849e449a50287ccc71..220cd1ad91f9e9e5fa91bfcab8334998602dc161 100644
--- a/labgrid/executor/executor.py
+++ b/labgrid/executor/executor.py
@@ -13,7 +13,7 @@ from shutil import which
 from subprocess import CalledProcessError, run
 from sys import argv, stderr
 
-from labgrid.executor.manager import Manager
+from bazel.labgrid.executor.manager import Manager
 
 
 def load(value: str) -> Manager:
diff --git a/labgrid/executor/host.py b/labgrid/executor/host.py
index 1e412cb7e5921997d240402086bc769bf2f3e96c..d638d9e4d987a90c0cdc1d00ae766e56618ee35b 100644
--- a/labgrid/executor/host.py
+++ b/labgrid/executor/host.py
@@ -5,7 +5,7 @@ from typing import Iterator
 
 from python.runfiles import Runfiles
 
-from labgrid.executor.manager import Data, Manager
+from bazel.labgrid.executor.manager import Data, Manager
 
 
 @contextmanager