diff --git a/cmd/tools/vbuild-tools.v b/cmd/tools/vbuild-tools.v
index b8a64cee5b..21dd815f2f 100644
--- a/cmd/tools/vbuild-tools.v
+++ b/cmd/tools/vbuild-tools.v
@@ -11,7 +11,7 @@ import v.util
 // should be compiled (v folder).
 // To implement that, these folders are initially skipped, then added
 // as a whole *after the testing.prepare_test_session call*.
-const tools_in_subfolders = ['vdoc', 'vvet', 'vast', 'vwhere', 'vcreate']
+const tools_in_subfolders = ['vast', 'vcreate', 'vdoc', 'vpm', 'vvet', 'vwhere']
 
 // non_packaged_tools are tools that should not be packaged with
 // prebuild versions of V, to keep the size smaller.
diff --git a/cmd/tools/vpm.v b/cmd/tools/vpm/vpm.v
similarity index 100%
rename from cmd/tools/vpm.v
rename to cmd/tools/vpm/vpm.v