diff --git a/qse/bld/os2-watcom/makefile b/qse/bld/os2-watcom/makefile
index 7534c7c6..a9822263 100644
--- a/qse/bld/os2-watcom/makefile
+++ b/qse/bld/os2-watcom/makefile
@@ -839,13 +839,13 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_rio.obj :  .AUTODEPEND ..\..\lib\aw
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj :  .AUTODEPEND ..\..\lib\awk\std.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(DLLQSEAWK_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj :  .AUTODEPEND ..\..\mod\awk\dir.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj :  .AUTODEPEND ..\..\lib\awk\mod\dir.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(MODQSEAWKDIR_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj :  .AUTODEPEND ..\..\mod\awk\str.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj :  .AUTODEPEND ..\..\lib\awk\mod\str.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(MODQSEAWKSTR_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj :  .AUTODEPEND ..\..\mod\awk\sys.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj :  .AUTODEPEND ..\..\lib\awk\mod\sys.c
 	$(CC) -bt=os2 -zq -fo=$^@ $(MODQSEAWKSYS_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj :  .AUTODEPEND ..\..\lib\sed\sed.c
diff --git a/qse/bld/qse.bkl b/qse/bld/qse.bkl
index 68bd6454..f11806e3 100644
--- a/qse/bld/qse.bkl
+++ b/qse/bld/qse.bkl
@@ -261,7 +261,7 @@
 	<dll id="modqseawkdir" template="base">
 		<dllname>$(AWKMODPREFIX)dir$(AWKMODPOSTFIX)</dllname>
 		<libname>$(AWKMODPREFIX)dir$(AWKMODPOSTFIX)</libname>
-		<set-srcdir>../../mod/awk</set-srcdir>
+		<set-srcdir>../../lib/awk/mod</set-srcdir>
 		<sources>dir.c</sources>
 		<library>dllqsecmn</library>
 		<library>dllqseawk</library>
@@ -271,7 +271,7 @@
 	<dll id="modqseawkstr" template="base">
 		<dllname>$(AWKMODPREFIX)str$(AWKMODPOSTFIX)</dllname>
 		<libname>$(AWKMODPREFIX)str$(AWKMODPOSTFIX)</libname>
-		<set-srcdir>../../mod/awk</set-srcdir>
+		<set-srcdir>../../lib/awk/mod</set-srcdir>
 		<sources>str.c</sources>
 		<library>dllqsecmn</library>
 		<library>dllqseawk</library>
@@ -281,7 +281,7 @@
 	<dll id="modqseawksys" template="base">
 		<dllname>$(AWKMODPREFIX)sys$(AWKMODPOSTFIX)</dllname>
 		<libname>$(AWKMODPREFIX)sys$(AWKMODPOSTFIX)</libname>
-		<set-srcdir>../../mod/awk</set-srcdir>
+		<set-srcdir>../../lib/awk/mod</set-srcdir>
 		<sources>sys.c</sources>
 		<library>dllqsecmn</library>
 		<library>dllqseawk</library>
diff --git a/qse/bld/win32-borland/makefile b/qse/bld/win32-borland/makefile
index 40ee4b0e..c62bcd4f 100644
--- a/qse/bld/win32-borland/makefile
+++ b/qse/bld/win32-borland/makefile
@@ -795,14 +795,14 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_rio.obj: ..\..\lib\awk\rio.c
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj: ..\..\lib\awk\std.c
 	$(CC) -q -c -P- -o$@ $(DLLQSEAWK_CFLAGS) ..\..\lib\awk\std.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj: ..\..\mod\awk\dir.c
-	$(CC) -q -c -P- -o$@ $(MODQSEAWKDIR_CFLAGS) ..\..\mod\awk\dir.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj: ..\..\lib\awk\mod\dir.c
+	$(CC) -q -c -P- -o$@ $(MODQSEAWKDIR_CFLAGS) ..\..\lib\awk\mod\dir.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj: ..\..\mod\awk\str.c
-	$(CC) -q -c -P- -o$@ $(MODQSEAWKSTR_CFLAGS) ..\..\mod\awk\str.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj: ..\..\lib\awk\mod\str.c
+	$(CC) -q -c -P- -o$@ $(MODQSEAWKSTR_CFLAGS) ..\..\lib\awk\mod\str.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj: ..\..\mod\awk\sys.c
-	$(CC) -q -c -P- -o$@ $(MODQSEAWKSYS_CFLAGS) ..\..\mod\awk\sys.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj: ..\..\lib\awk\mod\sys.c
+	$(CC) -q -c -P- -o$@ $(MODQSEAWKSYS_CFLAGS) ..\..\lib\awk\mod\sys.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj: ..\..\lib\sed\sed.c
 	$(CC) -q -c -P- -o$@ $(DLLQSESED_CFLAGS) ..\..\lib\sed\sed.c
diff --git a/qse/bld/win32-msvc/makefile b/qse/bld/win32-msvc/makefile
index ae4f5876..3a58e8f2 100644
--- a/qse/bld/win32-msvc/makefile
+++ b/qse/bld/win32-msvc/makefile
@@ -843,14 +843,14 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_rio.obj: ..\..\lib\awk\rio.c
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj: ..\..\lib\awk\std.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSEAWK_CFLAGS) ..\..\lib\awk\std.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj: ..\..\mod\awk\dir.c
-	$(CC) /c /nologo /TC /Fo$@ $(MODQSEAWKDIR_CFLAGS) ..\..\mod\awk\dir.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj: ..\..\lib\awk\mod\dir.c
+	$(CC) /c /nologo /TC /Fo$@ $(MODQSEAWKDIR_CFLAGS) ..\..\lib\awk\mod\dir.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj: ..\..\mod\awk\str.c
-	$(CC) /c /nologo /TC /Fo$@ $(MODQSEAWKSTR_CFLAGS) ..\..\mod\awk\str.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj: ..\..\lib\awk\mod\str.c
+	$(CC) /c /nologo /TC /Fo$@ $(MODQSEAWKSTR_CFLAGS) ..\..\lib\awk\mod\str.c
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj: ..\..\mod\awk\sys.c
-	$(CC) /c /nologo /TC /Fo$@ $(MODQSEAWKSYS_CFLAGS) ..\..\mod\awk\sys.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj: ..\..\lib\awk\mod\sys.c
+	$(CC) /c /nologo /TC /Fo$@ $(MODQSEAWKSYS_CFLAGS) ..\..\lib\awk\mod\sys.c
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj: ..\..\lib\sed\sed.c
 	$(CC) /c /nologo /TC /Fo$@ $(DLLQSESED_CFLAGS) ..\..\lib\sed\sed.c
diff --git a/qse/bld/win32-watcom/makefile b/qse/bld/win32-watcom/makefile
index 5b3ab4ce..03b88006 100644
--- a/qse/bld/win32-watcom/makefile
+++ b/qse/bld/win32-watcom/makefile
@@ -828,13 +828,13 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_rio.obj :  .AUTODEPEND ..\..\lib\aw
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqseawk_std.obj :  .AUTODEPEND ..\..\lib\awk\std.c
 	$(CC) -bt=nt -zq -fo=$^@ $(DLLQSEAWK_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj :  .AUTODEPEND ..\..\mod\awk\dir.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkdir_dir.obj :  .AUTODEPEND ..\..\lib\awk\mod\dir.c
 	$(CC) -bt=nt -zq -fo=$^@ $(MODQSEAWKDIR_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj :  .AUTODEPEND ..\..\mod\awk\str.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawkstr_str.obj :  .AUTODEPEND ..\..\lib\awk\mod\str.c
 	$(CC) -bt=nt -zq -fo=$^@ $(MODQSEAWKSTR_CFLAGS) $<
 
-$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj :  .AUTODEPEND ..\..\mod\awk\sys.c
+$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\modqseawksys_sys.obj :  .AUTODEPEND ..\..\lib\awk\mod\sys.c
 	$(CC) -bt=nt -zq -fo=$^@ $(MODQSEAWKSYS_CFLAGS) $<
 
 $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)\dllqsesed_sed.obj :  .AUTODEPEND ..\..\lib\sed\sed.c