From b474aa0faf8d055aaced80ed0687ac354d0864a0 Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Wed, 22 Apr 2026 17:05:13 +0300
Subject: [PATCH] all: src/ fixes

---
 .../{src => }/main.comments.out               |   0
 .../{src => }/main.readme.comments.out        |   0
 .../readme_in_project_root/{src => }/main.v   |   0
 .../{src => }/index.ts                        |   0
 .../typescript_vanilla_typeorm/package.json   |   2 +-
 .../{src => }/server.js                       |   2 +-
 .../typescript_vanilla_typeorm/tsconfig.json  |   2 +-
 .../v_veb_orm/{src => }/main.v                |  20 ++++++++++-------
 .../{src => }/assets/favicon.ico              | Bin
 .../veb_fullstack/{src => }/assets/v-logo.svg |   0
 .../veb_fullstack/{src => }/assets/veasel.png | Bin
 .../{src => }/auth_controllers.v              |   0
 examples/veb_fullstack/{src => }/auth_dto.v   |   0
 .../veb_fullstack/{src => }/auth_services.v   |   0
 .../databases/config_databases_sqlite.v       |   0
 examples/veb_fullstack/{src => }/index.html   |   0
 examples/veb_fullstack/{src => }/main.v       |   4 ++--
 .../{src => }/product_controller.v            |   0
 .../{src => }/product_entities.v              |   0
 .../veb_fullstack/{src => }/product_service.v |   0
 .../veb_fullstack/{src => }/product_view.v    |   0
 .../{src => }/product_view_api.v              |   0
 .../{src => }/templates/header_component.html |   0
 .../{src => }/templates/products.css          |   0
 .../{src => }/templates/products.html         |   0
 .../{src => }/user_controllers.v              |   0
 .../veb_fullstack/{src => }/user_entities.v   |   0
 .../veb_fullstack/{src => }/user_services.v   |   0
 examples/veb_fullstack/{src => }/v.mod        |   0
 .../veb_orm_jwt/{src => }/auth_controllers.v  |   0
 examples/veb_orm_jwt/{src => }/auth_dto.v     |   0
 .../veb_orm_jwt/{src => }/auth_services.v     |   0
 .../databases/config_databases_sqlite.v       |   0
 examples/veb_orm_jwt/{src => }/main.v         |   0
 .../veb_orm_jwt/{src => }/user_controllers.v  |   6 ++---
 .../veb_orm_jwt/{src => }/user_entities.v     |   0
 .../veb_orm_jwt/{src => }/user_services.v     |   0
 examples/veb_orm_jwt/{src => }/v.mod          |   0
 vlib/v/builder/builder.v                      |   2 +-
 vlib/v/builder/builder_test.v                 |  21 ++++++++++++++++++
 .../enum_from_string_in_different_mods.out    |  10 ++++-----
 .../{src => }/main.v                          |   0
 .../{src => }/mod/mod.v                       |   0
 .../tests/modules/module_struct_noinit.out    |   4 ++--
 .../module_struct_noinit/{src => }/main.v     |   0
 .../module_struct_noinit/{src => }/mod/mod.v  |   0
 .../{src => }/main_test.v                     |   0
 .../{src => }/mod/mod.v                       |   0
 .../{src => }/mod2/mod2.v                     |   0
 .../path4/hunam6/voak/{src => }/foo/foo.v     |   0
 50 files changed, 49 insertions(+), 24 deletions(-)
 rename cmd/tools/vdoc/testdata/readme_in_project_root/{src => }/main.comments.out (100%)
 rename cmd/tools/vdoc/testdata/readme_in_project_root/{src => }/main.readme.comments.out (100%)
 rename cmd/tools/vdoc/testdata/readme_in_project_root/{src => }/main.v (100%)
 rename examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/{src => }/index.ts (100%)
 rename examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/{src => }/server.js (97%)
 rename examples/js_dom_draw_benchmark_chart/v_veb_orm/{src => }/main.v (78%)
 rename examples/veb_fullstack/{src => }/assets/favicon.ico (100%)
 rename examples/veb_fullstack/{src => }/assets/v-logo.svg (100%)
 rename examples/veb_fullstack/{src => }/assets/veasel.png (100%)
 rename examples/veb_fullstack/{src => }/auth_controllers.v (100%)
 rename examples/veb_fullstack/{src => }/auth_dto.v (100%)
 rename examples/veb_fullstack/{src => }/auth_services.v (100%)
 rename examples/veb_fullstack/{src => }/databases/config_databases_sqlite.v (100%)
 rename examples/veb_fullstack/{src => }/index.html (100%)
 rename examples/veb_fullstack/{src => }/main.v (80%)
 rename examples/veb_fullstack/{src => }/product_controller.v (100%)
 rename examples/veb_fullstack/{src => }/product_entities.v (100%)
 rename examples/veb_fullstack/{src => }/product_service.v (100%)
 rename examples/veb_fullstack/{src => }/product_view.v (100%)
 rename examples/veb_fullstack/{src => }/product_view_api.v (100%)
 rename examples/veb_fullstack/{src => }/templates/header_component.html (100%)
 rename examples/veb_fullstack/{src => }/templates/products.css (100%)
 rename examples/veb_fullstack/{src => }/templates/products.html (100%)
 rename examples/veb_fullstack/{src => }/user_controllers.v (100%)
 rename examples/veb_fullstack/{src => }/user_entities.v (100%)
 rename examples/veb_fullstack/{src => }/user_services.v (100%)
 rename examples/veb_fullstack/{src => }/v.mod (100%)
 rename examples/veb_orm_jwt/{src => }/auth_controllers.v (100%)
 rename examples/veb_orm_jwt/{src => }/auth_dto.v (100%)
 rename examples/veb_orm_jwt/{src => }/auth_services.v (100%)
 rename examples/veb_orm_jwt/{src => }/databases/config_databases_sqlite.v (100%)
 rename examples/veb_orm_jwt/{src => }/main.v (100%)
 rename examples/veb_orm_jwt/{src => }/user_controllers.v (92%)
 rename examples/veb_orm_jwt/{src => }/user_entities.v (100%)
 rename examples/veb_orm_jwt/{src => }/user_services.v (100%)
 rename examples/veb_orm_jwt/{src => }/v.mod (100%)
 rename vlib/v/checker/tests/modules/enum_from_string_in_different_mods/{src => }/main.v (100%)
 rename vlib/v/checker/tests/modules/enum_from_string_in_different_mods/{src => }/mod/mod.v (100%)
 rename vlib/v/checker/tests/modules/module_struct_noinit/{src => }/main.v (100%)
 rename vlib/v/checker/tests/modules/module_struct_noinit/{src => }/mod/mod.v (100%)
 rename vlib/v/tests/modules/enum_from_string_in_different_mods/{src => }/main_test.v (100%)
 rename vlib/v/tests/modules/enum_from_string_in_different_mods/{src => }/mod/mod.v (100%)
 rename vlib/v/tests/modules/enum_from_string_in_different_mods/{src => }/mod2/mod2.v (100%)
 rename vlib/v/tests/multiple_paths_in_vmodules/path4/hunam6/voak/{src => }/foo/foo.v (100%)

diff --git a/cmd/tools/vdoc/testdata/readme_in_project_root/src/main.comments.out b/cmd/tools/vdoc/testdata/readme_in_project_root/main.comments.out
similarity index 100%
rename from cmd/tools/vdoc/testdata/readme_in_project_root/src/main.comments.out
rename to cmd/tools/vdoc/testdata/readme_in_project_root/main.comments.out
diff --git a/cmd/tools/vdoc/testdata/readme_in_project_root/src/main.readme.comments.out b/cmd/tools/vdoc/testdata/readme_in_project_root/main.readme.comments.out
similarity index 100%
rename from cmd/tools/vdoc/testdata/readme_in_project_root/src/main.readme.comments.out
rename to cmd/tools/vdoc/testdata/readme_in_project_root/main.readme.comments.out
diff --git a/cmd/tools/vdoc/testdata/readme_in_project_root/src/main.v b/cmd/tools/vdoc/testdata/readme_in_project_root/main.v
similarity index 100%
rename from cmd/tools/vdoc/testdata/readme_in_project_root/src/main.v
rename to cmd/tools/vdoc/testdata/readme_in_project_root/main.v
diff --git a/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/src/index.ts b/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/index.ts
similarity index 100%
rename from examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/src/index.ts
rename to examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/index.ts
diff --git a/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/package.json b/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/package.json
index e1ef66707..5dc39f912 100644
--- a/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/package.json
+++ b/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "dist/index.js",
   "scripts": {
-    "start": "npm run build && node src/server.js",
+    "start": "npm run build && node server.js",
     "start:dev": "./node_modules/nodemon/bin/nodemon.js -e ts  --exec \"npm run start\"",
     "build": "tsc"
   },
diff --git a/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/src/server.js b/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/server.js
similarity index 97%
rename from examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/src/server.js
rename to examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/server.js
index 59f32663e..130930874 100644
--- a/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/src/server.js
+++ b/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/server.js
@@ -1,7 +1,7 @@
 const http = require("http");
 const fs = require("fs");
 var path = require("path");
-const { hello, sqlite_memory, appDataSource } = require("..");
+const { hello, sqlite_memory, appDataSource } = require(".");
 
 const host = "localhost";
 const port = 3000;
diff --git a/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/tsconfig.json b/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/tsconfig.json
index 016f02acc..9692da882 100644
--- a/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/tsconfig.json
+++ b/examples/js_dom_draw_benchmark_chart/typescript_vanilla_typeorm/tsconfig.json
@@ -33,6 +33,6 @@
     // Completeness
     // Skip type checking all .d.ts files.
     "skipLibCheck": true      },
-    "include": ["src/**/*"]
+    "include": ["index.ts"]
 
 }
diff --git a/examples/js_dom_draw_benchmark_chart/v_veb_orm/src/main.v b/examples/js_dom_draw_benchmark_chart/v_veb_orm/main.v
similarity index 78%
rename from examples/js_dom_draw_benchmark_chart/v_veb_orm/src/main.v
rename to examples/js_dom_draw_benchmark_chart/v_veb_orm/main.v
index 6a239c90c..4ce9f1027 100644
--- a/examples/js_dom_draw_benchmark_chart/v_veb_orm/src/main.v
+++ b/examples/js_dom_draw_benchmark_chart/v_veb_orm/main.v
@@ -28,7 +28,7 @@ struct Response {
 
 fn main() {
 	mut app := &App{}
-	veb.run_at[App, Context](mut app, port: 4000)
+	veb.run_at[App, Context](mut app, port: 4000) or { panic(err) }
 }
 
 @['/hello-world']
@@ -37,7 +37,8 @@ pub fn (mut app App) hello_world(mut ctx Context) veb.Result {
 }
 
 @['/sqlite-memory/:count']
-pub fn (mut app App) sqlite_memory(mut ctx Context, count int) veb.Result {
+pub fn (mut app App) sqlite_memory(mut ctx Context, count string) veb.Result {
+	count_int := count.int()
 	mut insert_stopwatchs := []int{}
 	mut select_stopwatchs := []int{}
 	mut update_stopwatchs := []int{}
@@ -56,7 +57,7 @@ pub fn (mut app App) sqlite_memory(mut ctx Context, count int) veb.Result {
 	}
 
 	// inserts
-	for i := 0; i < count; i++ {
+	for i := 0; i < count_int; i++ {
 		sw.start()
 		sql db {
 			insert task_model into Task
@@ -66,7 +67,7 @@ pub fn (mut app App) sqlite_memory(mut ctx Context, count int) veb.Result {
 	}
 
 	// selects
-	for i := 0; i < count; i++ {
+	for i := 0; i < count_int; i++ {
 		sw.start()
 		result := sql db {
 			select from Task
@@ -77,7 +78,7 @@ pub fn (mut app App) sqlite_memory(mut ctx Context, count int) veb.Result {
 	}
 
 	// updates
-	for i := 0; i < count; i++ {
+	for i := 0; i < count_int; i++ {
 		sw.start()
 		sql db {
 			update Task set title = 'b', status = 'finish' where id == i
@@ -99,7 +100,8 @@ pub fn (mut app App) sqlite_memory(mut ctx Context, count int) veb.Result {
 }
 
 @['/sqlite-file/:count']
-pub fn (mut app App) sqlite_file(mut ctx Context, count int) veb.Result {
+pub fn (mut app App) sqlite_file(mut ctx Context, count string) veb.Result {
+	_ := count
 	response := Response{
 		insert: []
 		select: []
@@ -109,7 +111,8 @@ pub fn (mut app App) sqlite_file(mut ctx Context, count int) veb.Result {
 }
 
 @['/postgres/:count']
-pub fn (mut app App) postgres(mut ctx Context, count int) veb.Result {
+pub fn (mut app App) postgres(mut ctx Context, count string) veb.Result {
+	_ := count
 	response := Response{
 		insert: []
 		select: []
@@ -119,7 +122,8 @@ pub fn (mut app App) postgres(mut ctx Context, count int) veb.Result {
 }
 
 @['/mysql/:count']
-pub fn (mut app App) mysql(mut ctx Context, count int) veb.Result {
+pub fn (mut app App) mysql(mut ctx Context, count string) veb.Result {
+	_ := count
 	response := Response{
 		insert: []
 		select: []
diff --git a/examples/veb_fullstack/src/assets/favicon.ico b/examples/veb_fullstack/assets/favicon.ico
similarity index 100%
rename from examples/veb_fullstack/src/assets/favicon.ico
rename to examples/veb_fullstack/assets/favicon.ico
diff --git a/examples/veb_fullstack/src/assets/v-logo.svg b/examples/veb_fullstack/assets/v-logo.svg
similarity index 100%
rename from examples/veb_fullstack/src/assets/v-logo.svg
rename to examples/veb_fullstack/assets/v-logo.svg
diff --git a/examples/veb_fullstack/src/assets/veasel.png b/examples/veb_fullstack/assets/veasel.png
similarity index 100%
rename from examples/veb_fullstack/src/assets/veasel.png
rename to examples/veb_fullstack/assets/veasel.png
diff --git a/examples/veb_fullstack/src/auth_controllers.v b/examples/veb_fullstack/auth_controllers.v
similarity index 100%
rename from examples/veb_fullstack/src/auth_controllers.v
rename to examples/veb_fullstack/auth_controllers.v
diff --git a/examples/veb_fullstack/src/auth_dto.v b/examples/veb_fullstack/auth_dto.v
similarity index 100%
rename from examples/veb_fullstack/src/auth_dto.v
rename to examples/veb_fullstack/auth_dto.v
diff --git a/examples/veb_fullstack/src/auth_services.v b/examples/veb_fullstack/auth_services.v
similarity index 100%
rename from examples/veb_fullstack/src/auth_services.v
rename to examples/veb_fullstack/auth_services.v
diff --git a/examples/veb_fullstack/src/databases/config_databases_sqlite.v b/examples/veb_fullstack/databases/config_databases_sqlite.v
similarity index 100%
rename from examples/veb_fullstack/src/databases/config_databases_sqlite.v
rename to examples/veb_fullstack/databases/config_databases_sqlite.v
diff --git a/examples/veb_fullstack/src/index.html b/examples/veb_fullstack/index.html
similarity index 100%
rename from examples/veb_fullstack/src/index.html
rename to examples/veb_fullstack/index.html
diff --git a/examples/veb_fullstack/src/main.v b/examples/veb_fullstack/main.v
similarity index 80%
rename from examples/veb_fullstack/src/main.v
rename to examples/veb_fullstack/main.v
index 62c18439b..bf8eda6ef 100644
--- a/examples/veb_fullstack/src/main.v
+++ b/examples/veb_fullstack/main.v
@@ -29,8 +29,8 @@ fn main() {
 	db.close() or { panic(err) }
 
 	mut app := &App{}
-	app.serve_static('/favicon.ico', 'src/assets/favicon.ico')
-	app.mount_static_folder_at(os.resource_abs_path('.'), '/')
+	app.serve_static('/favicon.ico', 'assets/favicon.ico') or { panic(err) }
+	app.mount_static_folder_at(os.resource_abs_path('.'), '/') or { panic(err) }
 
 	veb.run[App, Context](mut app, port)
 }
diff --git a/examples/veb_fullstack/src/product_controller.v b/examples/veb_fullstack/product_controller.v
similarity index 100%
rename from examples/veb_fullstack/src/product_controller.v
rename to examples/veb_fullstack/product_controller.v
diff --git a/examples/veb_fullstack/src/product_entities.v b/examples/veb_fullstack/product_entities.v
similarity index 100%
rename from examples/veb_fullstack/src/product_entities.v
rename to examples/veb_fullstack/product_entities.v
diff --git a/examples/veb_fullstack/src/product_service.v b/examples/veb_fullstack/product_service.v
similarity index 100%
rename from examples/veb_fullstack/src/product_service.v
rename to examples/veb_fullstack/product_service.v
diff --git a/examples/veb_fullstack/src/product_view.v b/examples/veb_fullstack/product_view.v
similarity index 100%
rename from examples/veb_fullstack/src/product_view.v
rename to examples/veb_fullstack/product_view.v
diff --git a/examples/veb_fullstack/src/product_view_api.v b/examples/veb_fullstack/product_view_api.v
similarity index 100%
rename from examples/veb_fullstack/src/product_view_api.v
rename to examples/veb_fullstack/product_view_api.v
diff --git a/examples/veb_fullstack/src/templates/header_component.html b/examples/veb_fullstack/templates/header_component.html
similarity index 100%
rename from examples/veb_fullstack/src/templates/header_component.html
rename to examples/veb_fullstack/templates/header_component.html
diff --git a/examples/veb_fullstack/src/templates/products.css b/examples/veb_fullstack/templates/products.css
similarity index 100%
rename from examples/veb_fullstack/src/templates/products.css
rename to examples/veb_fullstack/templates/products.css
diff --git a/examples/veb_fullstack/src/templates/products.html b/examples/veb_fullstack/templates/products.html
similarity index 100%
rename from examples/veb_fullstack/src/templates/products.html
rename to examples/veb_fullstack/templates/products.html
diff --git a/examples/veb_fullstack/src/user_controllers.v b/examples/veb_fullstack/user_controllers.v
similarity index 100%
rename from examples/veb_fullstack/src/user_controllers.v
rename to examples/veb_fullstack/user_controllers.v
diff --git a/examples/veb_fullstack/src/user_entities.v b/examples/veb_fullstack/user_entities.v
similarity index 100%
rename from examples/veb_fullstack/src/user_entities.v
rename to examples/veb_fullstack/user_entities.v
diff --git a/examples/veb_fullstack/src/user_services.v b/examples/veb_fullstack/user_services.v
similarity index 100%
rename from examples/veb_fullstack/src/user_services.v
rename to examples/veb_fullstack/user_services.v
diff --git a/examples/veb_fullstack/src/v.mod b/examples/veb_fullstack/v.mod
similarity index 100%
rename from examples/veb_fullstack/src/v.mod
rename to examples/veb_fullstack/v.mod
diff --git a/examples/veb_orm_jwt/src/auth_controllers.v b/examples/veb_orm_jwt/auth_controllers.v
similarity index 100%
rename from examples/veb_orm_jwt/src/auth_controllers.v
rename to examples/veb_orm_jwt/auth_controllers.v
diff --git a/examples/veb_orm_jwt/src/auth_dto.v b/examples/veb_orm_jwt/auth_dto.v
similarity index 100%
rename from examples/veb_orm_jwt/src/auth_dto.v
rename to examples/veb_orm_jwt/auth_dto.v
diff --git a/examples/veb_orm_jwt/src/auth_services.v b/examples/veb_orm_jwt/auth_services.v
similarity index 100%
rename from examples/veb_orm_jwt/src/auth_services.v
rename to examples/veb_orm_jwt/auth_services.v
diff --git a/examples/veb_orm_jwt/src/databases/config_databases_sqlite.v b/examples/veb_orm_jwt/databases/config_databases_sqlite.v
similarity index 100%
rename from examples/veb_orm_jwt/src/databases/config_databases_sqlite.v
rename to examples/veb_orm_jwt/databases/config_databases_sqlite.v
diff --git a/examples/veb_orm_jwt/src/main.v b/examples/veb_orm_jwt/main.v
similarity index 100%
rename from examples/veb_orm_jwt/src/main.v
rename to examples/veb_orm_jwt/main.v
diff --git a/examples/veb_orm_jwt/src/user_controllers.v b/examples/veb_orm_jwt/user_controllers.v
similarity index 92%
rename from examples/veb_orm_jwt/src/user_controllers.v
rename to examples/veb_orm_jwt/user_controllers.v
index 6960e0270..7b5623477 100644
--- a/examples/veb_orm_jwt/src/user_controllers.v
+++ b/examples/veb_orm_jwt/user_controllers.v
@@ -5,8 +5,8 @@ import json
 import databases
 
 @['/user/:id/get'; get]
-pub fn (mut app App) controller_get_user_by_id(mut ctx Context, id int) veb.Result {
-	response := app.service_get_user_by_id(id) or {
+pub fn (mut app App) controller_get_user_by_id(mut ctx Context, id string) veb.Result {
+	response := app.service_get_user_by_id(id.int()) or {
 		ctx.res.set_status(.bad_request)
 		return ctx.text('${err}')
 	}
@@ -30,7 +30,7 @@ pub fn (mut app App) controller_create_user(mut ctx Context) veb.Result {
 
 @['/user/get_all'; get]
 pub fn (mut app App) controller_get_all_user(mut ctx Context) veb.Result {
-	token := ctx.get_header('token')
+	token := ctx.req.header.get_custom('token') or { '' }
 
 	if !auth_verify(token) {
 		ctx.res.set_status(.unauthorized)
diff --git a/examples/veb_orm_jwt/src/user_entities.v b/examples/veb_orm_jwt/user_entities.v
similarity index 100%
rename from examples/veb_orm_jwt/src/user_entities.v
rename to examples/veb_orm_jwt/user_entities.v
diff --git a/examples/veb_orm_jwt/src/user_services.v b/examples/veb_orm_jwt/user_services.v
similarity index 100%
rename from examples/veb_orm_jwt/src/user_services.v
rename to examples/veb_orm_jwt/user_services.v
diff --git a/examples/veb_orm_jwt/src/v.mod b/examples/veb_orm_jwt/v.mod
similarity index 100%
rename from examples/veb_orm_jwt/src/v.mod
rename to examples/veb_orm_jwt/v.mod
diff --git a/vlib/v/builder/builder.v b/vlib/v/builder/builder.v
index 04e6fdc97..af20b2cce 100644
--- a/vlib/v/builder/builder.v
+++ b/vlib/v/builder/builder.v
@@ -611,7 +611,7 @@ fn report_removed_src_layout_if_any(dir string) {
 	if !has_v_files {
 		return
 	}
-	verror('the virtual `src/` module directory is no longer supported.\nV found .v source files under ${src_dir}, but will not treat `src/` as a virtual module root anymore.\nPlease move the sources up from `src/` into ${dir}:\n\tmv ${src_dir}/*.v ${dir}/\n\trmdir ${src_dir}\n\nIf you really want the sources to live in a subfolder, set `base_url` in v.mod to point at it.')
+	verror('the virtual `src/` module directory is no longer supported.\nV found .v source files under ${src_dir}, but will not treat `src/` as a virtual module root anymore.\nPlease move the sources up from `src/` into ${dir}:\n\tmv ${src_dir}/*.v ${dir}/\n\trmdir ${src_dir}\n\nIf you want to split one module across subdirectories after moving the root files, add `subdirs` to v.mod, for example:\n\tsubdirs: [\'admin\', \'repo\', \'commit\', \'ci\', \'security\', \'ssh\', \'user\']')
 }
 
 fn (b &Builder) with_same_module_subdir_files(source_dir string, v_files []string) []string {
diff --git a/vlib/v/builder/builder_test.v b/vlib/v/builder/builder_test.v
index a814ba4f8..fd9e60ead 100644
--- a/vlib/v/builder/builder_test.v
+++ b/vlib/v/builder/builder_test.v
@@ -128,6 +128,27 @@ pub fn name() string {
 	assert run_v_ok('${os.quoted_path(vexe)} run ./source').trim_space() == 'foo+dep'
 }
 
+fn test_removed_src_layout_error_mentions_vmod_subdirs() {
+	os.chdir(test_path)!
+	project_dir := os.join_path(test_path, 'run_removed_src_project')
+	defer {
+		os.chdir(test_path) or {}
+	}
+	os.mkdir_all(os.join_path(project_dir, 'src'))!
+	os.write_file(os.join_path(project_dir, 'src', 'main.v'),
+		'fn main() {\n\tprintln("Hello from src")\n}\n')!
+	os.chdir(project_dir)!
+
+	res := os.execute('${os.quoted_path(vexe)} run .')
+	normalized_output := res.output.replace('\r\n', '\n')
+
+	assert res.exit_code != 0
+	assert normalized_output.contains('the virtual `src/` module directory is no longer supported.')
+	assert !normalized_output.contains('base_url')
+	assert normalized_output.contains('add `subdirs` to v.mod')
+	assert normalized_output.contains("subdirs: ['admin', 'repo', 'commit', 'ci', 'security', 'ssh', 'user']")
+}
+
 fn test_thirdparty_object_build_with_multiline_cflags() {
 	mut env := os.environ()
 	existing_cflags := if 'CFLAGS' in env { env['CFLAGS'] } else { '' }
diff --git a/vlib/v/checker/tests/modules/enum_from_string_in_different_mods.out b/vlib/v/checker/tests/modules/enum_from_string_in_different_mods.out
index 04a2780ad..8e982e134 100644
--- a/vlib/v/checker/tests/modules/enum_from_string_in_different_mods.out
+++ b/vlib/v/checker/tests/modules/enum_from_string_in_different_mods.out
@@ -1,31 +1,31 @@
-vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/main.v:3:14: error: module `enum_from_string_in_different_mods.mod` type `MyEnum` is private
+vlib/v/checker/tests/modules/enum_from_string_in_different_mods/main.v:3:14: error: module `enum_from_string_in_different_mods.mod` type `MyEnum` is private
     1 | module main
     2 |
     3 | import mod { MyEnum, MyStruct }
       |              ~~~~~~
     4 |
     5 | fn main() {
-vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/main.v:6:7: error: module `enum_from_string_in_different_mods.mod` type `enum_from_string_in_different_mods.mod.MyEnum` is private
+vlib/v/checker/tests/modules/enum_from_string_in_different_mods/main.v:6:7: error: module `enum_from_string_in_different_mods.mod` type `enum_from_string_in_different_mods.mod.MyEnum` is private
     4 |
     5 | fn main() {
     6 |     _ := MyEnum.from_string('item1')
       |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     7 |     _ := MyStruct.from_string('item1')
     8 | }
-vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/main.v:6:4: error: assignment mismatch: 1 variable but `MyEnum.from_string()` returns 0 values
+vlib/v/checker/tests/modules/enum_from_string_in_different_mods/main.v:6:4: error: assignment mismatch: 1 variable but `MyEnum.from_string()` returns 0 values
     4 |
     5 | fn main() {
     6 |     _ := MyEnum.from_string('item1')
       |       ~~
     7 |     _ := MyStruct.from_string('item1')
     8 | }
-vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/main.v:7:7: error: expected enum, but `enum_from_string_in_different_mods.mod.MyStruct` is struct
+vlib/v/checker/tests/modules/enum_from_string_in_different_mods/main.v:7:7: error: expected enum, but `enum_from_string_in_different_mods.mod.MyStruct` is struct
     5 | fn main() {
     6 |     _ := MyEnum.from_string('item1')
     7 |     _ := MyStruct.from_string('item1')
       |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     8 | }
-vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/main.v:7:4: error: assignment mismatch: 1 variable but `MyStruct.from_string()` returns 0 values
+vlib/v/checker/tests/modules/enum_from_string_in_different_mods/main.v:7:4: error: assignment mismatch: 1 variable but `MyStruct.from_string()` returns 0 values
     5 | fn main() {
     6 |     _ := MyEnum.from_string('item1')
     7 |     _ := MyStruct.from_string('item1')
diff --git a/vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/main.v b/vlib/v/checker/tests/modules/enum_from_string_in_different_mods/main.v
similarity index 100%
rename from vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/main.v
rename to vlib/v/checker/tests/modules/enum_from_string_in_different_mods/main.v
diff --git a/vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/mod/mod.v b/vlib/v/checker/tests/modules/enum_from_string_in_different_mods/mod/mod.v
similarity index 100%
rename from vlib/v/checker/tests/modules/enum_from_string_in_different_mods/src/mod/mod.v
rename to vlib/v/checker/tests/modules/enum_from_string_in_different_mods/mod/mod.v
diff --git a/vlib/v/checker/tests/modules/module_struct_noinit.out b/vlib/v/checker/tests/modules/module_struct_noinit.out
index a5b80d2ab..c376d6080 100644
--- a/vlib/v/checker/tests/modules/module_struct_noinit.out
+++ b/vlib/v/checker/tests/modules/module_struct_noinit.out
@@ -1,10 +1,10 @@
-vlib/v/checker/tests/modules/module_struct_noinit/src/main.v:12:9: error: struct `module_struct_noinit.src.mod.Foo` is declared with a `@[noinit]` attribute, so it cannot be initialized with `module_struct_noinit.src.mod.Foo{}`
+vlib/v/checker/tests/modules/module_struct_noinit/main.v:12:9: error: struct `module_struct_noinit.mod.Foo` is declared with a `@[noinit]` attribute, so it cannot be initialized with `module_struct_noinit.mod.Foo{}`
    10 |
    11 | fn default_value[T]() T {
    12 |     return T{}
       |            ~~~
    13 | }
-vlib/v/checker/tests/modules/module_struct_noinit/src/main.v:12:9: error: struct `module_struct_noinit.src.mod.Foo2[int]` is declared with a `@[noinit]` attribute, so it cannot be initialized with `module_struct_noinit.src.mod.Foo2[int]{}`
+vlib/v/checker/tests/modules/module_struct_noinit/main.v:12:9: error: struct `module_struct_noinit.mod.Foo2[int]` is declared with a `@[noinit]` attribute, so it cannot be initialized with `module_struct_noinit.mod.Foo2[int]{}`
    10 |
    11 | fn default_value[T]() T {
    12 |     return T{}
diff --git a/vlib/v/checker/tests/modules/module_struct_noinit/src/main.v b/vlib/v/checker/tests/modules/module_struct_noinit/main.v
similarity index 100%
rename from vlib/v/checker/tests/modules/module_struct_noinit/src/main.v
rename to vlib/v/checker/tests/modules/module_struct_noinit/main.v
diff --git a/vlib/v/checker/tests/modules/module_struct_noinit/src/mod/mod.v b/vlib/v/checker/tests/modules/module_struct_noinit/mod/mod.v
similarity index 100%
rename from vlib/v/checker/tests/modules/module_struct_noinit/src/mod/mod.v
rename to vlib/v/checker/tests/modules/module_struct_noinit/mod/mod.v
diff --git a/vlib/v/tests/modules/enum_from_string_in_different_mods/src/main_test.v b/vlib/v/tests/modules/enum_from_string_in_different_mods/main_test.v
similarity index 100%
rename from vlib/v/tests/modules/enum_from_string_in_different_mods/src/main_test.v
rename to vlib/v/tests/modules/enum_from_string_in_different_mods/main_test.v
diff --git a/vlib/v/tests/modules/enum_from_string_in_different_mods/src/mod/mod.v b/vlib/v/tests/modules/enum_from_string_in_different_mods/mod/mod.v
similarity index 100%
rename from vlib/v/tests/modules/enum_from_string_in_different_mods/src/mod/mod.v
rename to vlib/v/tests/modules/enum_from_string_in_different_mods/mod/mod.v
diff --git a/vlib/v/tests/modules/enum_from_string_in_different_mods/src/mod2/mod2.v b/vlib/v/tests/modules/enum_from_string_in_different_mods/mod2/mod2.v
similarity index 100%
rename from vlib/v/tests/modules/enum_from_string_in_different_mods/src/mod2/mod2.v
rename to vlib/v/tests/modules/enum_from_string_in_different_mods/mod2/mod2.v
diff --git a/vlib/v/tests/multiple_paths_in_vmodules/path4/hunam6/voak/src/foo/foo.v b/vlib/v/tests/multiple_paths_in_vmodules/path4/hunam6/voak/foo/foo.v
similarity index 100%
rename from vlib/v/tests/multiple_paths_in_vmodules/path4/hunam6/voak/src/foo/foo.v
rename to vlib/v/tests/multiple_paths_in_vmodules/path4/hunam6/voak/foo/foo.v
-- 
2.39.5