diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.dsp b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
index 3a20345a..f288ee62 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.dsp
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "NDEBUG" /D "BACDL_BIP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TSM_ENABLED=1 /D BACAPP_PRINT_ENABLED=1 /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\.." /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "NDEBUG" /D "BACDL_BIP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BACAPP_ALL" /D BACAPP_PRINT_ENABLED=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\.." /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "_DEBUG" /D BACDL_BIP=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TSM_ENABLED=1 /D PRINT_ENABLED=1 /D BIG_ENDIAN=0 /D USE_INADDR=0 /FR /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\include\\" /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "_DEBUG" /D "BACDL_BIP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BACAPP_ALL" /D PRINT_ENABLED=1 /D BIG_ENDIAN=0 /D USE_INADDR=0 /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -89,11 +89,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\abort.c
+SOURCE=..\..\..\src\abort.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\address.c
+SOURCE=..\..\..\src\address.c
 # End Source File
 # Begin Source File
 
@@ -105,11 +105,11 @@ SOURCE=..\..\..\demo\object\ao.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\apdu.c
+SOURCE=..\..\..\src\apdu.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\arf.c
+SOURCE=..\..\..\src\arf.c
 # End Source File
 # Begin Source File
 
@@ -117,15 +117,19 @@ SOURCE=..\..\..\demo\object\av.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacapp.c
+SOURCE=..\..\..\src\bacaddr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacdcode.c
+SOURCE=..\..\..\src\bacapp.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacerror.c
+SOURCE=..\..\..\src\bacdcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\bacerror.c
 # End Source File
 # Begin Source File
 
@@ -133,11 +137,19 @@ SOURCE=..\..\..\demo\object\bacfile.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacstr.c
+SOURCE=..\..\..\src\bacint.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bactext.c
+SOURCE=..\..\..\src\bacreal.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\bacstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\bactext.c
 # End Source File
 # Begin Source File
 
@@ -145,7 +157,7 @@ SOURCE=..\..\..\demo\object\bi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bigend.c
+SOURCE=..\..\..\src\bigend.c
 # End Source File
 # Begin Source File
 
@@ -153,7 +165,7 @@ SOURCE="..\bip-init.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bip.c
+SOURCE=..\..\..\src\bip.c
 # End Source File
 # Begin Source File
 
@@ -165,15 +177,15 @@ SOURCE=..\..\..\demo\object\bv.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\crc.c
+SOURCE=..\..\..\src\crc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\datetime.c
+SOURCE=..\..\..\src\datetime.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\dcc.c
+SOURCE=..\..\..\src\dcc.c
 # End Source File
 # Begin Source File
 
@@ -209,11 +221,11 @@ SOURCE=..\..\..\demo\handler\h_wp.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\iam.c
+SOURCE=..\..\..\src\iam.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\indtext.c
+SOURCE=..\..\..\src\indtext.c
 # End Source File
 # Begin Source File
 
@@ -245,23 +257,19 @@ SOURCE=..\..\..\demo\handler\noserv.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\npdu.c
+SOURCE=..\..\..\src\npdu.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\version.c
+SOURCE=..\..\..\src\reject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\reject.c
+SOURCE=..\..\..\src\ringbuf.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\ringbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\rp.c
+SOURCE=..\..\..\src\rp.c
 # End Source File
 # Begin Source File
 
@@ -277,7 +285,7 @@ SOURCE=..\..\..\demo\handler\s_wp.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\tsm.c
+SOURCE=..\..\..\src\tsm.c
 # End Source File
 # Begin Source File
 
@@ -285,11 +293,15 @@ SOURCE=..\..\..\demo\handler\txbuf.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\whois.c
+SOURCE=..\..\..\src\version.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\wp.c
+SOURCE=..\..\..\src\whois.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\wp.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -297,11 +309,11 @@ SOURCE=..\..\..\wp.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\abort.h
+SOURCE=..\..\..\include\abort.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\address.h
+SOURCE=..\..\..\include\address.h
 # End Source File
 # Begin Source File
 
@@ -313,31 +325,31 @@ SOURCE=..\..\..\demo\object\ao.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\apdu.h
+SOURCE=..\..\..\include\apdu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\arcnet.h
+SOURCE=..\..\..\include\arcnet.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacapp.h
+SOURCE=..\..\..\include\bacapp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacdcode.h
+SOURCE=..\..\..\include\bacdcode.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacdef.h
+SOURCE=..\..\..\include\bacdef.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacenum.h
+SOURCE=..\..\..\include\bacenum.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacerror.h
+SOURCE=..\..\..\include\bacerror.h
 # End Source File
 # Begin Source File
 
@@ -345,23 +357,23 @@ SOURCE=..\..\..\demo\object\bacfile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bacstr.h
+SOURCE=..\..\..\include\bacstr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bactext.h
+SOURCE=..\..\..\include\bactext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bigend.h
+SOURCE=..\..\..\include\bigend.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bip.h
+SOURCE=..\..\..\include\bip.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bits.h
+SOURCE=..\..\..\include\bits.h
 # End Source File
 # Begin Source File
 
@@ -373,23 +385,23 @@ SOURCE=..\..\..\demo\object\bv.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\bytes.h
+SOURCE=..\..\..\include\bytes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\config.h
+SOURCE=..\..\..\include\config.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\crc.h
+SOURCE=..\..\..\include\crc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\datalink.h
+SOURCE=..\..\..\include\datalink.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\datetime.h
+SOURCE=..\..\..\include\datetime.h
 # End Source File
 # Begin Source File
 
@@ -397,15 +409,15 @@ SOURCE=..\..\..\demo\object\device.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\ethernet.h
+SOURCE=..\..\..\include\ethernet.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\handlers.h
+SOURCE=..\..\..\include\handlers.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\iam.h
+SOURCE=..\..\..\include\iam.h
 # End Source File
 # Begin Source File
 
@@ -413,31 +425,27 @@ SOURCE=..\..\..\demo\object\mso.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\mstp.h
+SOURCE=..\..\..\include\mstp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\npdu.h
+SOURCE=..\..\..\include\npdu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\version.h
+SOURCE=..\..\..\include\reject.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\reject.h
+SOURCE=..\..\..\include\ringbuf.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\ringbuf.h
+SOURCE=..\..\..\include\rp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\rp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\rs485.h
+SOURCE=..\..\..\include\rs485.h
 # End Source File
 # Begin Source File
 
@@ -449,15 +457,19 @@ SOURCE=..\stdint.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\tsm.h
+SOURCE=..\..\..\include\tsm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\whois.h
+SOURCE=..\..\..\include\version.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\wp.h
+SOURCE=..\..\..\include\whois.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\include\wp.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.ncb b/bacnet-stack/ports/win32/bacnet/bacnet.ncb
index bde7ab87..1c72e8ab 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.ncb and b/bacnet-stack/ports/win32/bacnet/bacnet.ncb differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.opt b/bacnet-stack/ports/win32/bacnet/bacnet.opt
index 36ef07ac..fc56e475 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.opt and b/bacnet-stack/ports/win32/bacnet/bacnet.opt differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.plg b/bacnet-stack/ports/win32/bacnet/bacnet.plg
index 378e0134..d46b83ad 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.plg
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.plg
@@ -6,60 +6,15 @@
 --------------------Configuration: bacnet - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP632.tmp" with contents
+Creating temporary file "C:\DOCUME~1\cbkargs\LOCALS~1\Temp\RSP72.tmp" with contents
 [
-/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\..\.." /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "_DEBUG" /D BACDL_BIP=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TSM_ENABLED=1 /D PRINT_ENABLED=1 /D BIG_ENDIAN=0 /D USE_INADDR=0 /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\code\bacnet-stack\abort.c"
-"C:\code\bacnet-stack\address.c"
-"C:\code\bacnet-stack\demo\object\ai.c"
-"C:\code\bacnet-stack\demo\object\ao.c"
-"C:\code\bacnet-stack\apdu.c"
-"C:\code\bacnet-stack\arf.c"
-"C:\code\bacnet-stack\demo\object\av.c"
-"C:\code\bacnet-stack\bacapp.c"
-"C:\code\bacnet-stack\bacdcode.c"
-"C:\code\bacnet-stack\bacerror.c"
-"C:\code\bacnet-stack\demo\object\bacfile.c"
-"C:\code\bacnet-stack\bacstr.c"
-"C:\code\bacnet-stack\bactext.c"
-"C:\code\bacnet-stack\demo\object\bi.c"
-"C:\code\bacnet-stack\bigend.c"
-"C:\code\bacnet-stack\ports\win32\bip-init.c"
-"C:\code\bacnet-stack\bip.c"
-"C:\code\bacnet-stack\demo\object\bo.c"
-"C:\code\bacnet-stack\demo\object\bv.c"
-"C:\code\bacnet-stack\crc.c"
-"C:\code\bacnet-stack\datetime.c"
-"C:\code\bacnet-stack\dcc.c"
-"C:\code\bacnet-stack\demo\object\device.c"
-"C:\code\bacnet-stack\demo\handler\h_arf.c"
-"C:\code\bacnet-stack\demo\handler\h_arf_a.c"
-"C:\code\bacnet-stack\demo\handler\h_iam.c"
-"C:\code\bacnet-stack\demo\handler\h_rp.c"
-"C:\code\bacnet-stack\demo\handler\h_rp_a.c"
-"C:\code\bacnet-stack\demo\handler\h_whois.c"
-"C:\code\bacnet-stack\demo\handler\h_wp.c"
-"C:\code\bacnet-stack\iam.c"
-"C:\code\bacnet-stack\indtext.c"
-"C:\code\bacnet-stack\demo\object\lc.c"
-"C:\code\bacnet-stack\demo\object\lsp.c"
-"C:\code\bacnet-stack\ports\win32\main.c"
-"C:\code\bacnet-stack\demo\object\mso.c"
-"C:\code\bacnet-stack\demo\handler\noserv.c"
-"C:\code\bacnet-stack\npdu.c"
-"C:\code\bacnet-stack\reject.c"
-"C:\code\bacnet-stack\ringbuf.c"
-"C:\code\bacnet-stack\rp.c"
-"C:\code\bacnet-stack\demo\handler\s_rp.c"
-"C:\code\bacnet-stack\demo\handler\s_whois.c"
-"C:\code\bacnet-stack\demo\handler\s_wp.c"
-"C:\code\bacnet-stack\tsm.c"
-"C:\code\bacnet-stack\demo\handler\txbuf.c"
-"C:\code\bacnet-stack\whois.c"
-"C:\code\bacnet-stack\wp.c"
+/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\..\..\include\\" /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "_DEBUG" /D "BACDL_BIP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BACAPP_ALL" /D PRINT_ENABLED=1 /D BIG_ENDIAN=0 /D USE_INADDR=0 /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\code\bacnet-stack\src\bacreal.c"
+"C:\code\bacnet-stack\src\bacaddr.c"
+"C:\code\bacnet-stack\src\bacint.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP632.tmp" 
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP633.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\cbkargs\LOCALS~1\Temp\RSP72.tmp" 
+Creating temporary file "C:\DOCUME~1\cbkargs\LOCALS~1\Temp\RSP73.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/bacnet.pdb" /debug /machine:I386 /out:"Debug/bacnet.exe" /pdbtype:sept 
 ".\Debug\abort.obj"
@@ -100,6 +55,7 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\mso.obj"
 ".\Debug\noserv.obj"
 ".\Debug\npdu.obj"
+".\Debug\version.obj"
 ".\Debug\reject.obj"
 ".\Debug\ringbuf.obj"
 ".\Debug\rp.obj"
@@ -110,65 +66,19 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\txbuf.obj"
 ".\Debug\whois.obj"
 ".\Debug\wp.obj"
+".\Debug\bacreal.obj"
+".\Debug\bacaddr.obj"
+".\Debug\bacint.obj"
 ]
-Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP633.tmp"
+Creating command line "link.exe @C:\DOCUME~1\cbkargs\LOCALS~1\Temp\RSP73.tmp"
 <h3>Output Window</h3>
 Compiling...
-abort.c
-address.c
-ai.c
-ao.c
-apdu.c
-arf.c
-av.c
-bacapp.c
-bacdcode.c
-bacerror.c
-bacfile.c
-bacstr.c
-bactext.c
-bi.c
-bigend.c
-bip-init.c
-bip.c
-bo.c
-bv.c
-crc.c
-Generating Code...
-Compiling...
-datetime.c
-dcc.c
-device.c
-h_arf.c
-h_arf_a.c
-h_iam.c
-h_rp.c
-h_rp_a.c
-h_whois.c
-h_wp.c
-iam.c
-indtext.c
-lc.c
-lsp.c
-main.c
-mso.c
-noserv.c
-npdu.c
-reject.c
-ringbuf.c
-Generating Code...
-Compiling...
-rp.c
-s_rp.c
-s_whois.c
-s_wp.c
-tsm.c
-txbuf.c
-whois.c
-wp.c
+bacreal.c
+bacaddr.c
+bacint.c
 Generating Code...
 Linking...
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP635.tmp" with contents
+Creating temporary file "C:\DOCUME~1\cbkargs\LOCALS~1\Temp\RSP75.tmp" with contents
 [
 /nologo /o"Debug/bacnet.bsc" 
 ".\Debug\abort.sbr"
@@ -209,6 +119,7 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP635.tmp" with conten
 ".\Debug\mso.sbr"
 ".\Debug\noserv.sbr"
 ".\Debug\npdu.sbr"
+".\Debug\version.sbr"
 ".\Debug\reject.sbr"
 ".\Debug\ringbuf.sbr"
 ".\Debug\rp.sbr"
@@ -218,8 +129,11 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP635.tmp" with conten
 ".\Debug\tsm.sbr"
 ".\Debug\txbuf.sbr"
 ".\Debug\whois.sbr"
-".\Debug\wp.sbr"]
-Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP635.tmp"
+".\Debug\wp.sbr"
+".\Debug\bacreal.sbr"
+".\Debug\bacaddr.sbr"
+".\Debug\bacint.sbr"]
+Creating command line "bscmake.exe @C:\DOCUME~1\cbkargs\LOCALS~1\Temp\RSP75.tmp"
 Creating browse info file...
 <h3>Output Window</h3>