diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index d6cad00d..1b1403dc 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -6,10 +6,13 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#CFLAGS  = -Wall -I. -Iports/linux -g -DBACFILE=1 -DBACDL_ETHERNET=1
-#CFLAGS  = -Wall -I. -Iports/linux -g -DBACFILE=1 -DBACDL_ARCNET=1
-#CFLAGS  = -Wall -I. -Iports/linux -g -DBACFILE=1 -DBACDL_MSTP=1 
-CFLAGS  = -Wall -I. -Iports/linux -g -DBACFILE=1 -DBACDL_BIP=1
+#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
+#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
+#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
+DEFINES = -DBACFILE=1 -DBACDL_BIP=1 
+INCLUDES = -I. -Iports/linux -Idemo/object
+
+CFLAGS  = -Wall -g $(INCLUDES) $(DEFINES)
 
 SRCS = ports/linux/main.c \
        ports/linux/ethernet.c \
@@ -30,10 +33,10 @@ SRCS = ports/linux/main.c \
        tsm.c \
        datalink.c \
        address.c \
-       device.c \
-       ai.c \
-       ao.c \
-       bacfile.c \
+       demo/object/device.c \
+       demo/object/ai.c \
+       demo/object/ao.c \
+       demo/object/bacfile.c \
        arf.c \
        awf.c \
        abort.c \
diff --git a/bacnet-stack/arf.mak b/bacnet-stack/arf.mak
index b75bf76a..d691a917 100644
--- a/bacnet-stack/arf.mak
+++ b/bacnet-stack/arf.mak
@@ -1,10 +1,10 @@
 #Makefile to build test case
 CC      = gcc
 BASEDIR = .
-#CFLAGS  = -Wall -I.
 # -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_ATOMIC_READ_FILE -DBACDL_BIP=1 -g
+DEFINES = -DBACFILE=1 -DBACDL_BIP=1 -DTEST -DTEST_ATOMIC_READ_FILE 
+INCLUDES = -I. -Idemo/object -Itest 
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 SRCS = bacdcode.c \
        bacstr.c \
diff --git a/bacnet-stack/awf.mak b/bacnet-stack/awf.mak
index 76f794a6..f647b583 100644
--- a/bacnet-stack/awf.mak
+++ b/bacnet-stack/awf.mak
@@ -1,10 +1,10 @@
 #Makefile to build test case
 CC      = gcc
 BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_ATOMIC_WRITE_FILE -DBACDL_BIP=1 -g
+
+DEFINES = -DBACFILE=1 -DBACDL_BIP=1 -DTEST -DTEST_ATOMIC_WRITE_FILE 
+INCLUDES = -I. -Idemo/object -Itest 
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 SRCS = bacdcode.c \
        bacstr.c \
diff --git a/bacnet-stack/datalink.c b/bacnet-stack/datalink.c
index b62d661a..77df8ba1 100644
--- a/bacnet-stack/datalink.c
+++ b/bacnet-stack/datalink.c
@@ -39,12 +39,6 @@
 // However, it could handle multiple data links with the
 // addition of passing a network number or datalink number
 // as part of the calls.
-#if defined(BACDL_ARCNET) || defined(BACDL_MSTP) || \
-  defined(BACDL_ETHERNET)  || defined(BACDL_BIP) 
-  /* valid! */
-#else
-  #error BACDL_ARCNET, BACDL_MSTP, BACDL_ETHERNET, or BACDL_BIP must be defined! 
-#endif
 
 /* returns number of bytes sent on success, negative on failure */
 int datalink_send_pdu(
diff --git a/bacnet-stack/ai.c b/bacnet-stack/demo/object/ai.c
similarity index 100%
rename from bacnet-stack/ai.c
rename to bacnet-stack/demo/object/ai.c
diff --git a/bacnet-stack/ai.h b/bacnet-stack/demo/object/ai.h
similarity index 100%
rename from bacnet-stack/ai.h
rename to bacnet-stack/demo/object/ai.h
diff --git a/bacnet-stack/ai.mak b/bacnet-stack/demo/object/ai.mak
similarity index 84%
rename from bacnet-stack/ai.mak
rename to bacnet-stack/demo/object/ai.mak
index 6aef7e43..529cb4cc 100755
--- a/bacnet-stack/ai.mak
+++ b/bacnet-stack/demo/object/ai.mak
@@ -6,10 +6,11 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -g
 CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_ANALOG_INPUT -g
 
+# NOTE: this file is normally called by the unittest.sh from up directory
 SRCS = bacdcode.c \
        bacstr.c \
        bigend.c \
-       ai.c \
+       demo/object/ai.c \
        test/ctest.c
 
 OBJS = ${SRCS:.c=.o}
diff --git a/bacnet-stack/ao.c b/bacnet-stack/demo/object/ao.c
similarity index 100%
rename from bacnet-stack/ao.c
rename to bacnet-stack/demo/object/ao.c
diff --git a/bacnet-stack/ao.h b/bacnet-stack/demo/object/ao.h
similarity index 100%
rename from bacnet-stack/ao.h
rename to bacnet-stack/demo/object/ao.h
diff --git a/bacnet-stack/ao.mak b/bacnet-stack/demo/object/ao.mak
similarity index 84%
rename from bacnet-stack/ao.mak
rename to bacnet-stack/demo/object/ao.mak
index d61cb1a6..4ade212c 100755
--- a/bacnet-stack/ao.mak
+++ b/bacnet-stack/demo/object/ao.mak
@@ -6,10 +6,11 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -g
 CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_ANALOG_OUTPUT -g
 
+# NOTE: this file is normally called by the unittest.sh from up directory
 SRCS = bacdcode.c \
        bacstr.c \
        bigend.c \
-       ao.c \
+       demo/object/ao.c \
        test/ctest.c
 
 OBJS = ${SRCS:.c=.o}
diff --git a/bacnet-stack/bacfile.c b/bacnet-stack/demo/object/bacfile.c
similarity index 100%
rename from bacnet-stack/bacfile.c
rename to bacnet-stack/demo/object/bacfile.c
diff --git a/bacnet-stack/bacfile.h b/bacnet-stack/demo/object/bacfile.h
similarity index 100%
rename from bacnet-stack/bacfile.h
rename to bacnet-stack/demo/object/bacfile.h
diff --git a/bacnet-stack/device.c b/bacnet-stack/demo/object/device.c
similarity index 100%
rename from bacnet-stack/device.c
rename to bacnet-stack/demo/object/device.c
diff --git a/bacnet-stack/device.h b/bacnet-stack/demo/object/device.h
similarity index 100%
rename from bacnet-stack/device.h
rename to bacnet-stack/demo/object/device.h
diff --git a/bacnet-stack/device.mak b/bacnet-stack/demo/object/device.mak
similarity index 83%
rename from bacnet-stack/device.mak
rename to bacnet-stack/demo/object/device.mak
index 098c6638..658015f9 100644
--- a/bacnet-stack/device.mak
+++ b/bacnet-stack/demo/object/device.mak
@@ -6,10 +6,11 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -g
 CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_DEVICE -g
 
+# NOTE: this file is normally called by the unittest.sh from up directory
 SRCS = bacdcode.c \
        bigend.c \
        bacstr.c \
-       device.c \
+       demo/object/device.c \
        test/ctest.c
 
 OBJS = ${SRCS:.c=.o}
diff --git a/bacnet-stack/iam.mak b/bacnet-stack/iam.mak
index 97dc37dd..8dcdbf48 100755
--- a/bacnet-stack/iam.mak
+++ b/bacnet-stack/iam.mak
@@ -1,10 +1,10 @@
 #Makefile to build test case
 CC      = gcc
 BASEDIR = .
-#CFLAGS  = -Wall -I.
 # -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_IAM -g
+DEFINES = -DBACFILE=1 -DTEST -DTEST_IAM
+INCLUDES = -I. -Idemo/object -Itest 
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 SRCS = bacdcode.c \
        bacstr.c \
diff --git a/bacnet-stack/ports/rtos32/makefile.mak b/bacnet-stack/ports/rtos32/makefile.mak
index 0aa92cb4..fc64338b 100644
--- a/bacnet-stack/ports/rtos32/makefile.mak
+++ b/bacnet-stack/ports/rtos32/makefile.mak
@@ -40,10 +40,10 @@ SRCS = init.c main.c ethernet.c bip-init.c \
        ..\..\wp.c \
        ..\..\arf.c \
        ..\..\awf.c \
-       ..\..\bacfile.c \
-       ..\..\device.c \
-       ..\..\ai.c \
-       ..\..\ao.c \
+       ..\..\demo\object\bacfile.c \
+       ..\..\demo\object\device.c \
+       ..\..\demo\object\ai.c \
+       ..\..\demo\object\ao.c \
        ..\..\datalink.c \
        ..\..\tsm.c \
        ..\..\address.c \
diff --git a/bacnet-stack/ports/win32/MAKEFILE.MAK b/bacnet-stack/ports/win32/MAKEFILE.MAK
index 4983cce5..43e9a1e6 100644
--- a/bacnet-stack/ports/win32/MAKEFILE.MAK
+++ b/bacnet-stack/ports/win32/MAKEFILE.MAK
@@ -32,10 +32,10 @@ SRCS = main.c bip-init.c \
        ..\..\wp.c \
        ..\..\arf.c \
        ..\..\awf.c \
-       ..\..\bacfile.c \
-       ..\..\device.c \
-       ..\..\ai.c \
-       ..\..\ao.c \
+       ..\..\demo\object\bacfile.c \
+       ..\..\demo\object\device.c \
+       ..\..\demo\object\ai.c \
+       ..\..\demo\object\ao.c \
        ..\..\datalink.c \
        ..\..\tsm.c \
        ..\..\address.c \
diff --git a/bacnet-stack/tsm.mak b/bacnet-stack/tsm.mak
index cf5111ca..0e853a05 100644
--- a/bacnet-stack/tsm.mak
+++ b/bacnet-stack/tsm.mak
@@ -1,18 +1,17 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
 # -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_TSM -g
+DEFINES = -DTEST -DTEST_TSM
+INCLUDES = -I. -Idemo/object -Itest -Iports/linux
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 SRCS = address.c \
        bacdcode.c \
        bacstr.c \
        bigend.c \
-       device.c \
-       ai.c \
-       ao.c \
+       demo/object/device.c \
+       demo/object/ai.c \
+       demo/object/ao.c \
        iam.c \
        npdu.c \
        apdu.c \
diff --git a/bacnet-stack/test.sh b/bacnet-stack/unittest.sh
similarity index 87%
rename from bacnet-stack/test.sh
rename to bacnet-stack/unittest.sh
index d9baeb00..3708fb46 100755
--- a/bacnet-stack/test.sh
+++ b/bacnet-stack/unittest.sh
@@ -14,15 +14,15 @@ make -f address.mak
 ./address >> test.log
 make -f address.mak clean
 
-make -f ai.mak clean
-make -f ai.mak
+make -f demo/object/ai.mak clean
+make -f demo/object/ai.mak
 ./analog_input >> test.log
-make -f ai.mak clean
+make -f demo/object/ai.mak clean
 
-make -f ao.mak clean
-make -f ao.mak
+make -f demo/object/ao.mak clean
+make -f demo/object/ao.mak
 ./analog_output >> test.log
-make -f ao.mak clean
+make -f demo/object/ao.mak clean
 
 make -f arf.mak clean
 make -f arf.mak
@@ -59,10 +59,10 @@ make -f crc.mak
 ./crc >> test.log
 make -f crc.mak clean
 
-make -f device.mak clean
-make -f device.mak
+make -f demo/object/device.mak clean
+make -f demo/object/device.mak
 ./device >> test.log
-make -f device.mak clean
+make -f demo/object/device.mak clean
 
 make -f iam.mak clean
 make -f iam.mak
diff --git a/bacnet-stack/wp.mak b/bacnet-stack/wp.mak
index 7c8bf9d0..ac1f999c 100644
--- a/bacnet-stack/wp.mak
+++ b/bacnet-stack/wp.mak
@@ -1,10 +1,10 @@
 #Makefile to build test case
 CC      = gcc
 BASEDIR = .
-#CFLAGS  = -Wall -I.
 # -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_WRITE_PROPERTY -DBACDL_BIP=1 -g
+DEFINES = -DBACFILE=1 -DBACDL_BIP=1 -DTEST -DTEST_WRITE_PROPERTY 
+INCLUDES = -I. -Idemo/object -Itest 
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 SRCS = bacdcode.c \
        bacstr.c \