diff --git a/expat/bcb5/ExpatGroup.bpg b/expat/bcb5/ExpatGroup.bpg
index 0add0d8a..ff21c52f 100644
--- a/expat/bcb5/ExpatGroup.bpg
+++ b/expat/bcb5/ExpatGroup.bpg
@@ -9,8 +9,7 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = setup expat.dll expatw.dll elements.exe outline.exe gennmtab.exe \
-  xmlwf.exe
+PROJECTS = setup libexpat.dll libexpatw.dll elements.exe outline.exe xmlwf.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
@@ -19,14 +18,6 @@ elements.exe: elements.bpr
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
-expat.dll: expat.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-expatw.dll: expatw.bpr
-  $(ROOT)\bin\bpr2mak $**
-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
 outline.exe: outline.bpr
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
@@ -38,7 +29,11 @@ xmlwf.exe: xmlwf.bpr
 setup: setup.bat
   call $**
 
-gennmtab.exe: gennmtab.bpr
+libexpat.dll: libexpat.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+libexpatw.dll: libexpatw.bpr
   $(ROOT)\bin\bpr2mak $**
   $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
 
diff --git a/expat/bcb5/elements.bpf b/expat/bcb5/elements.bpf
index fb2412b9..e5d663a6 100644
--- a/expat/bcb5/elements.bpf
+++ b/expat/bcb5/elements.bpf
@@ -1,3 +1,3 @@
-USEUNIT("..\Source\examples\elements.c");
+USEUNIT("..\examples\elements.c");
 //---------------------------------------------------------------------------
 #define WinMain
diff --git a/expat/bcb5/elements.bpr b/expat/bcb5/elements.bpr
index 2e6d0005..d29273ad 100644
--- a/expat/bcb5/elements.bpr
+++ b/expat/bcb5/elements.bpr
@@ -17,7 +17,7 @@
       ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
       VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
       dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi"/>
-    <PATHCPP value=".;..\Source\examples"/>
+    <PATHCPP value=".;..\examples"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -27,8 +27,8 @@
     <USERDEFINES value="WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG"/>
     <SYSDEFINES value="_MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="elements.bpf"/>
-    <INCLUDEPATH value="$(BCB)\include;..\Source\examples;..\Source\lib"/>
-    <LIBPATH value="$(BCB)\lib;..\Source\examples;debug"/>
+    <INCLUDEPATH value="$(BCB)\include;..\examples;..\lib"/>
+    <LIBPATH value="$(BCB)\lib;..\examples;debug"/>
     <WARNINGS value="-w-par -w-8027 -w-8026"/>
   </MACROS>
   <OPTIONS>
diff --git a/expat/bcb5/elements.mak b/expat/bcb5/elements.mak
index 8449c3be..480f074e 100644
--- a/expat/bcb5/elements.mak
+++ b/expat/bcb5/elements.mak
@@ -29,7 +29,7 @@ PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
 SPARELIBS = 
 DEFFILE = 
 # ---------------------------------------------------------------------------
-PATHCPP = .;..\Source\examples
+PATHCPP = .;..\examples
 PATHASM = .;
 PATHPAS = .;
 PATHRC = .;
@@ -37,8 +37,8 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 USERDEFINES = WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG
 SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
-INCLUDEPATH = $(BCB)\include;..\Source\examples;..\Source\lib
-LIBPATH = $(BCB)\lib;..\Source\examples;debug
+INCLUDEPATH = $(BCB)\include;..\examples;..\lib
+LIBPATH = $(BCB)\lib;..\examples;debug
 WARNINGS= -w-par -w-8027 -w-8026
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -I..\lib -c
diff --git a/expat/bcb5/makefile.mak b/expat/bcb5/makefile.mak
index ca25c3c6..0fb4e7c3 100644
--- a/expat/bcb5/makefile.mak
+++ b/expat/bcb5/makefile.mak
@@ -1,20 +1,17 @@
-all: setup expat expatw elements gennmtab outline xmlwf
+all: setup expat expatw elements outline xmlwf
 
 setup:
  setup
 
 expat:
- make -f expat.mak
+ make -f libexpat.mak
 
 expatw:
- make -f expatw.mak
+ make -f libexpatw.mak
 
 elements:
  make -f elements.mak
 
-gennmtab:
- make -f gennmtab.mak
-
 outline:
  make -f outline.mak
 
diff --git a/expat/bcb5/outline.bpf b/expat/bcb5/outline.bpf
index 94159874..f07ee384 100644
--- a/expat/bcb5/outline.bpf
+++ b/expat/bcb5/outline.bpf
@@ -1,3 +1,3 @@
-USEUNIT("..\Source\examples\outline.c");
+USEUNIT("..\examples\outline.c");
 //---------------------------------------------------------------------------
 #define WinMain
diff --git a/expat/bcb5/outline.bpr b/expat/bcb5/outline.bpr
index 6164569e..55bc6055 100644
--- a/expat/bcb5/outline.bpr
+++ b/expat/bcb5/outline.bpr
@@ -17,7 +17,7 @@
       ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
       VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
       dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi"/>
-    <PATHCPP value=".;..\Source\examples"/>
+    <PATHCPP value=".;..\examples"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -27,8 +27,8 @@
     <USERDEFINES value="WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG"/>
     <SYSDEFINES value="_MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="outline.bpf"/>
-    <INCLUDEPATH value="$(BCB)\include;..\Source\examples;..\Source\lib"/>
-    <LIBPATH value="$(BCB)\lib;..\Source\examples;debug"/>
+    <INCLUDEPATH value="$(BCB)\include;..\examples;..\lib"/>
+    <LIBPATH value="$(BCB)\lib;..\examples;debug"/>
     <WARNINGS value="-w-par -w-8027 -w-8026"/>
   </MACROS>
   <OPTIONS>
diff --git a/expat/bcb5/outline.mak b/expat/bcb5/outline.mak
index e30f0a5c..741010f3 100644
--- a/expat/bcb5/outline.mak
+++ b/expat/bcb5/outline.mak
@@ -29,7 +29,7 @@ PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
 SPARELIBS = 
 DEFFILE = 
 # ---------------------------------------------------------------------------
-PATHCPP = .;..\Source\examples
+PATHCPP = .;..\examples
 PATHASM = .;
 PATHPAS = .;
 PATHRC = .;
@@ -37,8 +37,8 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 USERDEFINES = WIN32;NDEBUG;_CONSOLE;_MBCS;_DEBUG
 SYSDEFINES = _MSC_VER=1100;_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
-INCLUDEPATH = $(BCB)\include;..\Source\examples;..\Source\lib
-LIBPATH = $(BCB)\lib;..\Source\examples;debug
+INCLUDEPATH = $(BCB)\include;..\examples;..\lib
+LIBPATH = $(BCB)\lib;..\examples;debug
 WARNINGS= -w-par -w-8027 -w-8026
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -X- -r- -a8 -5 -b -k -y -v -vi- -q -I..\lib -c
diff --git a/expat/bcb5/xmlwf.bpf b/expat/bcb5/xmlwf.bpf
index b5c8b542..02277fce 100644
--- a/expat/bcb5/xmlwf.bpf
+++ b/expat/bcb5/xmlwf.bpf
@@ -1,6 +1,6 @@
-USEUNIT("..\Source\xmlwf\xmlfile.c");
-USEUNIT("..\Source\xmlwf\win32filemap.c");
-USEUNIT("..\Source\xmlwf\codepage.c");
-USEUNIT("..\Source\xmlwf\xmlwf.c");
+USEUNIT("..\xmlwf\xmlfile.c");
+USEUNIT("..\xmlwf\win32filemap.c");
+USEUNIT("..\xmlwf\codepage.c");
+USEUNIT("..\xmlwf\xmlwf.c");
 //---------------------------------------------------------------------------
 #define WinMain
diff --git a/expat/bcb5/xmlwf.bpr b/expat/bcb5/xmlwf.bpr
index 77b0ab6a..123b7b9a 100644
--- a/expat/bcb5/xmlwf.bpr
+++ b/expat/bcb5/xmlwf.bpr
@@ -4,8 +4,8 @@
   <MACROS>
     <VERSION value="BCB.05.03"/>
     <PROJECT value="debug\xmlwf.exe"/>
-    <OBJFILES value="debug\obj\xmlfile.obj debug\obj\win32filemap.obj 
-      debug\obj\codepage.obj debug\obj\xmlwf.obj"/>
+    <OBJFILES value="debug\obj\xmlfile.obj debug\obj\win32filemap.obj debug\obj\codepage.obj 
+      debug\obj\xmlwf.obj"/>
     <RESFILES value=""/>
     <IDLFILES value=""/>
     <IDLGENFILES value=""/>
@@ -18,7 +18,7 @@
       ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
       VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
       dclocx50.bpi bcb2kaxserver50.bpi dclusr50.bpi"/>
-    <PATHCPP value=".;..\Source\xmlwf"/>
+    <PATHCPP value=".;..\xmlwf"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -28,8 +28,8 @@
     <USERDEFINES value="NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP"/>
     <SYSDEFINES value="_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
     <MAINSOURCE value="xmlwf.bpf"/>
-    <INCLUDEPATH value="$(BCB)\include;..\Source\xmlwf;..\Source\lib"/>
-    <LIBPATH value="$(BCB)\lib;..\Source\xmlwf;debug"/>
+    <INCLUDEPATH value="$(BCB)\include;..\xmlwf;..\lib"/>
+    <LIBPATH value="$(BCB)\lib;..\xmlwf;debug"/>
     <WARNINGS value="-w-8065 -w-par -w-8027 -w-8026 -w-csu"/>
   </MACROS>
   <OPTIONS>
diff --git a/expat/bcb5/xmlwf.mak b/expat/bcb5/xmlwf.mak
index 4590f6ff..0bf48488 100644
--- a/expat/bcb5/xmlwf.mak
+++ b/expat/bcb5/xmlwf.mak
@@ -14,8 +14,8 @@ BCB = $(MAKEDIR)\..
 VERSION = BCB.05.03
 # ---------------------------------------------------------------------------
 PROJECT = debug\xmlwf.exe
-OBJFILES = debug\obj\xmlfile.obj debug\obj\win32filemap.obj \
-    debug\obj\codepage.obj debug\obj\xmlwf.obj
+OBJFILES = debug\obj\xmlfile.obj debug\obj\win32filemap.obj debug\obj\codepage.obj \
+    debug\obj\xmlwf.obj
 RESFILES = 
 MAINSOURCE = xmlwf.bpf
 RESDEPEN = $(RESFILES)
@@ -30,7 +30,7 @@ PACKAGES = VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
 SPARELIBS = 
 DEFFILE = 
 # ---------------------------------------------------------------------------
-PATHCPP = .;..\Source\xmlwf
+PATHCPP = .;..\xmlwf
 PATHASM = .;
 PATHPAS = .;
 PATHRC = .;
@@ -38,8 +38,8 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 USERDEFINES = NDEBUG;WIN32;_CONSOLE;COMPILED_FROM_DSP
 SYSDEFINES = _NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL
-INCLUDEPATH = $(BCB)\include;..\Source\xmlwf;..\Source\lib
-LIBPATH = $(BCB)\lib;..\Source\xmlwf;debug
+INCLUDEPATH = $(BCB)\include;..\xmlwf;..\lib
+LIBPATH = $(BCB)\lib;..\xmlwf;debug
 WARNINGS= -w-8065 -w-par -w-8027 -w-8026 -w-csu
 # ---------------------------------------------------------------------------
 CFLAG1 = -O2 -X- -a8 -5 -b -k -vi -q -I..\lib -c