diff --git a/src/device/Dockerfile b/src/device/Dockerfile
index 909ae3bd31817401412629cbc04b5c0577b40355..b230350c7b331eefbb6d4ac0f9bf3b5b46364254 100644
--- a/src/device/Dockerfile
+++ b/src/device/Dockerfile
@@ -62,9 +62,11 @@ RUN python3 -m pip install -r requirements.txt
 
 # Add component files into working directory
 WORKDIR /var/teraflow
-COPY src/context/. context/
+COPY src/context/__init__.py context/__init__.py
+COPY src/context/client/. context/client/
+COPY src/monitoring/__init__.py monitoring/__init__.py
+COPY src/monitoring/client/. monitoring/client/
 COPY src/device/. device/
-COPY src/monitoring/. monitoring/
 
 RUN mkdir -p tests/tools/mock_ietf_actn_sdn_ctrl
 RUN touch tests/__init__.py
diff --git a/src/pathcomp/frontend/Dockerfile b/src/pathcomp/frontend/Dockerfile
index 955844cf4d80b39fc0913c9c523fd1267ca0fb1d..b54a49cabab79112e65b28a7e5e28d5a17056d67 100644
--- a/src/pathcomp/frontend/Dockerfile
+++ b/src/pathcomp/frontend/Dockerfile
@@ -54,26 +54,28 @@ RUN rm *.proto
 RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;
 
 # Create component sub-folders, get specific Python packages
-RUN mkdir -p /var/teraflow/pathcomp
-WORKDIR /var/teraflow/pathcomp
+RUN mkdir -p /var/teraflow/pathcomp/frontend
+WORKDIR /var/teraflow/pathcomp/frontend
 COPY src/pathcomp/frontend/requirements.in requirements.in
 RUN pip-compile --quiet --output-file=requirements.txt requirements.in
 RUN python3 -m pip install -r requirements.txt
 
 # Add component files into working directory
 WORKDIR /var/teraflow
+COPY src/pathcomp/__init__.py pathcomp/__init__.py
+COPY src/pathcomp/frontend/. pathcomp/frontend/
 COPY src/context/__init__.py context/__init__.py
 COPY src/context/client/. context/client/
 COPY src/device/__init__.py device/__init__.py
 COPY src/device/client/. device/client/
-COPY src/forecaster/. forecaster/
+COPY src/forecaster/__init__.py forecaster/__init__.py
+COPY src/forecaster/client/. forecaster/client/
 COPY src/monitoring/__init__.py monitoring/__init__.py
 COPY src/monitoring/client/. monitoring/client/
 COPY src/service/__init__.py service/__init__.py
 COPY src/service/client/. service/client/
 COPY src/slice/__init__.py slice/__init__.py
 COPY src/slice/client/. slice/client/
-COPY src/pathcomp/. pathcomp/
 
 # Start the service
 ENTRYPOINT ["python", "-m", "pathcomp.frontend.service"]
diff --git a/src/service/Dockerfile b/src/service/Dockerfile
index 85454350f1eb9413af0ef995386868d09222121c..aed4ce64c60a7cfca5b80dc46e03bad18a017ca9 100644
--- a/src/service/Dockerfile
+++ b/src/service/Dockerfile
@@ -62,7 +62,6 @@ RUN python3 -m pip install -r requirements.txt
 
 # Add component files into working directory
 WORKDIR /var/teraflow
-COPY src/service/. service/
 COPY src/context/__init__.py context/__init__.py
 COPY src/context/client/. context/client/
 COPY src/device/__init__.py device/__init__.py
@@ -71,6 +70,7 @@ COPY src/pathcomp/frontend/__init__.py pathcomp/frontend/__init__.py
 COPY src/pathcomp/frontend/client/. pathcomp/frontend/client/
 COPY src/e2e_orchestrator/__init__.py e2e_orchestrator/__init__.py
 COPY src/e2e_orchestrator/client/. e2e_orchestrator/client/
+COPY src/service/. service/
 
 # Start the service
 ENTRYPOINT ["python", "-m", "service.service"]
diff --git a/src/slice/Dockerfile b/src/slice/Dockerfile
index 94d5fc040dff083407cae514ed0363b5d2ea9bb1..da380eabc7f8a54b235b87b338ad82a4ead88b4d 100644
--- a/src/slice/Dockerfile
+++ b/src/slice/Dockerfile
@@ -62,10 +62,15 @@ RUN python3 -m pip install -r requirements.txt
 
 # Add component files into working directory
 WORKDIR /var/teraflow
-COPY src/context/. context/
-COPY src/interdomain/. interdomain/
-COPY src/pathcomp/. pathcomp/
-COPY src/service/. service/
+COPY src/context/__init__.py context/__init__.py
+COPY src/context/client/. context/client/
+COPY src/interdomain/__init__.py interdomain/__init__.py
+COPY src/interdomain/client/. interdomain/client/
+COPY src/pathcomp/__init__.py pathcomp/__init__.py
+COPY src/pathcomp/frontend/__init__.py pathcomp/frontend/__init__.py
+COPY src/pathcomp/frontend/client/. pathcomp/frontend/client/
+COPY src/service/__init__.py service/__init__.py
+COPY src/service/client/. service/client/
 COPY src/slice/. slice/
 
 # Start the service