diff --git a/cmd/tools/vtest-cleancode.v b/cmd/tools/vtest-cleancode.v
index 475481cf32..9993409791 100644
--- a/cmd/tools/vtest-cleancode.v
+++ b/cmd/tools/vtest-cleancode.v
@@ -22,7 +22,6 @@ const vet_known_failing_windows = [
 ]
 
 const vet_folders = [
-	'vlib/sqlite',
 	'vlib/v',
 	'vlib/x/json2',
 	'vlib/x/ttf',
@@ -53,7 +52,7 @@ const is_fix = '-fix' in os.args
 fn main() {
 	args_string := os.args[1..].join(' ')
 	pass_args := args_string.all_before('test-cleancode')
-	v_test_vetting(pass_args)
+	v_test_vetting(pass_args)!
 }
 
 fn tsession(vargs string, tool_source string, tool_cmd string, tool_args string, flist []string, slist []string) testing.TestSession {
@@ -72,8 +71,8 @@ fn tsession(vargs string, tool_source string, tool_cmd string, tool_args string,
 	return test_session
 }
 
-fn v_test_vetting(vargs string) {
-	expanded_vet_list := util.find_all_v_files(vet_folders) or { return }
+fn v_test_vetting(vargs string) ! {
+	expanded_vet_list := util.find_all_v_files(vet_folders)!
 	mut vet_known_exceptions := vet_known_failing.clone()
 	if os.user_os() == 'windows' {
 		vet_known_exceptions << vet_known_failing_windows
diff --git a/cmd/tools/vtest-self.v b/cmd/tools/vtest-self.v
index 7cac8d2930..faa6a28870 100644
--- a/cmd/tools/vtest-self.v
+++ b/cmd/tools/vtest-self.v
@@ -326,9 +326,11 @@ fn main() {
 		tsession.skip_files << test_js_files.map(it.replace(testroot, ''))
 	}
 	testing.find_started_process('mysqld') or {
-		tsession.skip_files << 'vlib/mysql/mysql_orm_test.v'
+		tsession.skip_files << 'vlib/db/mysql/mysql_orm_test.v'
+	}
+	testing.find_started_process('postgres') or {
+		tsession.skip_files << 'vlib/db/pg/pg_orm_test.v'
 	}
-	testing.find_started_process('postgres') or { tsession.skip_files << 'vlib/pg/pg_orm_test.v' }
 
 	if github_job == 'windows-tcc' {
 		// TODO: fix these ASAP
diff --git a/tutorials/building_a_simple_web_blog_with_vweb/README.md b/tutorials/building_a_simple_web_blog_with_vweb/README.md
index 2d12f60c85..10725b3ca0 100644
--- a/tutorials/building_a_simple_web_blog_with_vweb/README.md
+++ b/tutorials/building_a_simple_web_blog_with_vweb/README.md
@@ -40,7 +40,7 @@ Now V should be globally available on your system.
 ### Install SQLite development dependency
 
 If you don't have it already installed, look at the
-[`sqlite` README](../../vlib/sqlite/README.md) for instructions.
+[`sqlite` README](../../vlib/db/sqlite/README.md) for instructions.
 
 ### Creating a new Vweb project