diff --git a/pkg/vtpm/Dockerfile b/pkg/vtpm/Dockerfile
index 0e817da103..b001517e02 100644
--- a/pkg/vtpm/Dockerfile
+++ b/pkg/vtpm/Dockerfile
@@ -70,9 +70,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 go build -ldflags "-s -w -X=main.Version=${GOPK
 
 # Build ptpm
 WORKDIR /ptpm-build
-COPY Makefile /ptpm-build/
-COPY src/ /ptpm-build/src
-COPY proto/ /ptpm-build/proto
+ADD ptpm/ /ptpm-build
 RUN make -j$(nproc) && cp ptpm /out/usr/bin/
 RUN strip --strip-unneeded /out/usr/bin/ptpm
 
diff --git a/pkg/vtpm/Makefile b/pkg/vtpm/ptpm/Makefile
similarity index 100%
rename from pkg/vtpm/Makefile
rename to pkg/vtpm/ptpm/Makefile
diff --git a/pkg/vtpm/fuzz/Makefile b/pkg/vtpm/ptpm/fuzz/Makefile
similarity index 100%
rename from pkg/vtpm/fuzz/Makefile
rename to pkg/vtpm/ptpm/fuzz/Makefile
diff --git a/pkg/vtpm/fuzz/README.md b/pkg/vtpm/ptpm/fuzz/README.md
similarity index 100%
rename from pkg/vtpm/fuzz/README.md
rename to pkg/vtpm/ptpm/fuzz/README.md
diff --git a/pkg/vtpm/fuzz/fuzz.sh b/pkg/vtpm/ptpm/fuzz/fuzz.sh
similarity index 100%
rename from pkg/vtpm/fuzz/fuzz.sh
rename to pkg/vtpm/ptpm/fuzz/fuzz.sh
diff --git a/pkg/vtpm/fuzz/fuzzing.patch b/pkg/vtpm/ptpm/fuzz/fuzzing.patch
similarity index 100%
rename from pkg/vtpm/fuzz/fuzzing.patch
rename to pkg/vtpm/ptpm/fuzz/fuzzing.patch
diff --git a/pkg/vtpm/fuzz/install-clang.sh b/pkg/vtpm/ptpm/fuzz/install-clang.sh
similarity index 100%
rename from pkg/vtpm/fuzz/install-clang.sh
rename to pkg/vtpm/ptpm/fuzz/install-clang.sh
diff --git a/pkg/vtpm/proto/api.proto b/pkg/vtpm/ptpm/proto/api.proto
similarity index 100%
rename from pkg/vtpm/proto/api.proto
rename to pkg/vtpm/ptpm/proto/api.proto
diff --git a/pkg/vtpm/src/server.cpp b/pkg/vtpm/ptpm/src/server.cpp
similarity index 100%
rename from pkg/vtpm/src/server.cpp
rename to pkg/vtpm/ptpm/src/server.cpp