diff --git a/bacnet-stack/bacnet.h b/bacnet-stack/bacnet.h
deleted file mode 100644
index 5c26f8ca..00000000
--- a/bacnet-stack/bacnet.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*####COPYRIGHTBEGIN####
- -------------------------------------------
- Copyright (C) 2006 Steve Karg
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to:
- The Free Software Foundation, Inc.
- 59 Temple Place - Suite 330
- Boston, MA  02111-1307, USA.
-
- As a special exception, if other files instantiate templates or
- use macros or inline functions from this file, or you compile
- this file and link it with other works to produce a work based
- on this file, this file does not by itself cause the resulting
- work to be covered by the GNU General Public License. However
- the source code for this file must still be made available in
- accordance with section (3) of the GNU General Public License.
-
- This exception does not invalidate any other reasons why a work
- based on this file might be covered by the GNU General Public
- License.
- -------------------------------------------
-####COPYRIGHTEND####*/
-#ifndef BACNET_H
-#define BACNET_H
-
-/* This file is designed to reference the entire BACnet stack library */
-
-/* core files */
-#include "config.h"
-#include "address.h"
-#include "apdu.h"
-#include "bacapp.h"
-#include "bacdcode.h"
-#include "bacdef.h"
-#include "bacenum.h"
-#include "bacerror.h"
-#include "bacstr.h"
-#include "bactext.h"
-#include "datalink.h"
-#include "indtext.h"
-#include "npdu.h"
-#include "reject.h"
-#include "tsm.h"
-
-/* services */
-#include "arf.h"
-#include "awf.h"
-#include "cov.h"
-#include "dcc.h"
-#include "iam.h"
-#include "ihave.h"
-#include "rd.h"
-#include "rp.h"
-#include "rpm.h"
-#include "timesync.h"
-#include "whohas.h"
-#include "whois.h"
-#include "wp.h"
-
-/* required object - note: developer must supply the device.c file
-   since it is not included in the library.  However, the library
-   references the device.c members via the device.h API. */
-#include "device.h"
-
-#endif
diff --git a/bacnet-stack/address.h b/bacnet-stack/include/address.h
similarity index 100%
rename from bacnet-stack/address.h
rename to bacnet-stack/include/address.h
diff --git a/bacnet-stack/apdu.h b/bacnet-stack/include/apdu.h
similarity index 100%
rename from bacnet-stack/apdu.h
rename to bacnet-stack/include/apdu.h
diff --git a/bacnet-stack/arcnet.h b/bacnet-stack/include/arcnet.h
similarity index 100%
rename from bacnet-stack/arcnet.h
rename to bacnet-stack/include/arcnet.h
diff --git a/bacnet-stack/arf.h b/bacnet-stack/include/arf.h
similarity index 100%
rename from bacnet-stack/arf.h
rename to bacnet-stack/include/arf.h
diff --git a/bacnet-stack/awf.h b/bacnet-stack/include/awf.h
similarity index 100%
rename from bacnet-stack/awf.h
rename to bacnet-stack/include/awf.h
diff --git a/bacnet-stack/bacaddr.h b/bacnet-stack/include/bacaddr.h
similarity index 100%
rename from bacnet-stack/bacaddr.h
rename to bacnet-stack/include/bacaddr.h
diff --git a/bacnet-stack/bacapp.h b/bacnet-stack/include/bacapp.h
similarity index 100%
rename from bacnet-stack/bacapp.h
rename to bacnet-stack/include/bacapp.h
diff --git a/bacnet-stack/bacdcode.h b/bacnet-stack/include/bacdcode.h
similarity index 100%
rename from bacnet-stack/bacdcode.h
rename to bacnet-stack/include/bacdcode.h
diff --git a/bacnet-stack/bacdef.h b/bacnet-stack/include/bacdef.h
similarity index 100%
rename from bacnet-stack/bacdef.h
rename to bacnet-stack/include/bacdef.h
diff --git a/bacnet-stack/bacenum.h b/bacnet-stack/include/bacenum.h
similarity index 100%
rename from bacnet-stack/bacenum.h
rename to bacnet-stack/include/bacenum.h
diff --git a/bacnet-stack/bacerror.h b/bacnet-stack/include/bacerror.h
similarity index 100%
rename from bacnet-stack/bacerror.h
rename to bacnet-stack/include/bacerror.h
diff --git a/bacnet-stack/bacint.h b/bacnet-stack/include/bacint.h
similarity index 100%
rename from bacnet-stack/bacint.h
rename to bacnet-stack/include/bacint.h
diff --git a/bacnet-stack/include/bacnet.h b/bacnet-stack/include/bacnet.h
index 995cfa4b..5c26f8ca 100644
--- a/bacnet-stack/include/bacnet.h
+++ b/bacnet-stack/include/bacnet.h
@@ -1,6 +1,6 @@
 /*####COPYRIGHTBEGIN####
  -------------------------------------------
- Copyright (C) 2007 Steve Karg
+ Copyright (C) 2006 Steve Karg
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -34,20 +34,43 @@
 #ifndef BACNET_H
 #define BACNET_H
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-/* core modules of the BACnet stack */
+/* This file is designed to reference the entire BACnet stack library */
+
+/* core files */
 #include "config.h"
 #include "address.h"
-#include "bacdef.h"
-#include "bacdcode.h"
-#include "bacint.h"
-#include "npdu.h"
 #include "apdu.h"
-#include "iam.h"
-#include "tsm.h"
+#include "bacapp.h"
+#include "bacdcode.h"
+#include "bacdef.h"
+#include "bacenum.h"
+#include "bacerror.h"
+#include "bacstr.h"
+#include "bactext.h"
 #include "datalink.h"
+#include "indtext.h"
+#include "npdu.h"
+#include "reject.h"
+#include "tsm.h"
+
+/* services */
+#include "arf.h"
+#include "awf.h"
+#include "cov.h"
 #include "dcc.h"
+#include "iam.h"
+#include "ihave.h"
+#include "rd.h"
+#include "rp.h"
+#include "rpm.h"
+#include "timesync.h"
+#include "whohas.h"
+#include "whois.h"
+#include "wp.h"
+
+/* required object - note: developer must supply the device.c file
+   since it is not included in the library.  However, the library
+   references the device.c members via the device.h API. */
+#include "device.h"
 
 #endif
diff --git a/bacnet-stack/bacprop.h b/bacnet-stack/include/bacprop.h
similarity index 100%
rename from bacnet-stack/bacprop.h
rename to bacnet-stack/include/bacprop.h
diff --git a/bacnet-stack/bacstr.h b/bacnet-stack/include/bacstr.h
similarity index 100%
rename from bacnet-stack/bacstr.h
rename to bacnet-stack/include/bacstr.h
diff --git a/bacnet-stack/bactext.h b/bacnet-stack/include/bactext.h
similarity index 100%
rename from bacnet-stack/bactext.h
rename to bacnet-stack/include/bactext.h
diff --git a/bacnet-stack/bigend.h b/bacnet-stack/include/bigend.h
similarity index 100%
rename from bacnet-stack/bigend.h
rename to bacnet-stack/include/bigend.h
diff --git a/bacnet-stack/bip.h b/bacnet-stack/include/bip.h
similarity index 100%
rename from bacnet-stack/bip.h
rename to bacnet-stack/include/bip.h
diff --git a/bacnet-stack/bits.h b/bacnet-stack/include/bits.h
similarity index 100%
rename from bacnet-stack/bits.h
rename to bacnet-stack/include/bits.h
diff --git a/bacnet-stack/bvlc.h b/bacnet-stack/include/bvlc.h
similarity index 100%
rename from bacnet-stack/bvlc.h
rename to bacnet-stack/include/bvlc.h
diff --git a/bacnet-stack/bytes.h b/bacnet-stack/include/bytes.h
similarity index 100%
rename from bacnet-stack/bytes.h
rename to bacnet-stack/include/bytes.h
diff --git a/bacnet-stack/config.h b/bacnet-stack/include/config.h
similarity index 100%
rename from bacnet-stack/config.h
rename to bacnet-stack/include/config.h
diff --git a/bacnet-stack/cov.h b/bacnet-stack/include/cov.h
similarity index 100%
rename from bacnet-stack/cov.h
rename to bacnet-stack/include/cov.h
diff --git a/bacnet-stack/crc.h b/bacnet-stack/include/crc.h
similarity index 100%
rename from bacnet-stack/crc.h
rename to bacnet-stack/include/crc.h
diff --git a/bacnet-stack/datalink.h b/bacnet-stack/include/datalink.h
similarity index 100%
rename from bacnet-stack/datalink.h
rename to bacnet-stack/include/datalink.h
diff --git a/bacnet-stack/datetime.h b/bacnet-stack/include/datetime.h
similarity index 100%
rename from bacnet-stack/datetime.h
rename to bacnet-stack/include/datetime.h
diff --git a/bacnet-stack/dcc.h b/bacnet-stack/include/dcc.h
similarity index 100%
rename from bacnet-stack/dcc.h
rename to bacnet-stack/include/dcc.h
diff --git a/bacnet-stack/dlmstp.h b/bacnet-stack/include/dlmstp.h
similarity index 100%
rename from bacnet-stack/dlmstp.h
rename to bacnet-stack/include/dlmstp.h
diff --git a/bacnet-stack/ethernet.h b/bacnet-stack/include/ethernet.h
similarity index 100%
rename from bacnet-stack/ethernet.h
rename to bacnet-stack/include/ethernet.h
diff --git a/bacnet-stack/filename.h b/bacnet-stack/include/filename.h
similarity index 100%
rename from bacnet-stack/filename.h
rename to bacnet-stack/include/filename.h
diff --git a/bacnet-stack/iam.h b/bacnet-stack/include/iam.h
similarity index 100%
rename from bacnet-stack/iam.h
rename to bacnet-stack/include/iam.h
diff --git a/bacnet-stack/ihave.h b/bacnet-stack/include/ihave.h
similarity index 100%
rename from bacnet-stack/ihave.h
rename to bacnet-stack/include/ihave.h
diff --git a/bacnet-stack/indtext.h b/bacnet-stack/include/indtext.h
similarity index 100%
rename from bacnet-stack/indtext.h
rename to bacnet-stack/include/indtext.h
diff --git a/bacnet-stack/key.h b/bacnet-stack/include/key.h
similarity index 100%
rename from bacnet-stack/key.h
rename to bacnet-stack/include/key.h
diff --git a/bacnet-stack/keylist.h b/bacnet-stack/include/keylist.h
similarity index 100%
rename from bacnet-stack/keylist.h
rename to bacnet-stack/include/keylist.h
diff --git a/bacnet-stack/mstp.h b/bacnet-stack/include/mstp.h
similarity index 100%
rename from bacnet-stack/mstp.h
rename to bacnet-stack/include/mstp.h
diff --git a/bacnet-stack/mstptext.h b/bacnet-stack/include/mstptext.h
similarity index 100%
rename from bacnet-stack/mstptext.h
rename to bacnet-stack/include/mstptext.h
diff --git a/bacnet-stack/npdu.h b/bacnet-stack/include/npdu.h
similarity index 100%
rename from bacnet-stack/npdu.h
rename to bacnet-stack/include/npdu.h
diff --git a/bacnet-stack/rd.h b/bacnet-stack/include/rd.h
similarity index 100%
rename from bacnet-stack/rd.h
rename to bacnet-stack/include/rd.h
diff --git a/bacnet-stack/reject.h b/bacnet-stack/include/reject.h
similarity index 100%
rename from bacnet-stack/reject.h
rename to bacnet-stack/include/reject.h
diff --git a/bacnet-stack/ringbuf.h b/bacnet-stack/include/ringbuf.h
similarity index 100%
rename from bacnet-stack/ringbuf.h
rename to bacnet-stack/include/ringbuf.h
diff --git a/bacnet-stack/rp.h b/bacnet-stack/include/rp.h
similarity index 100%
rename from bacnet-stack/rp.h
rename to bacnet-stack/include/rp.h
diff --git a/bacnet-stack/rpm.h b/bacnet-stack/include/rpm.h
similarity index 100%
rename from bacnet-stack/rpm.h
rename to bacnet-stack/include/rpm.h
diff --git a/bacnet-stack/sbuf.h b/bacnet-stack/include/sbuf.h
similarity index 100%
rename from bacnet-stack/sbuf.h
rename to bacnet-stack/include/sbuf.h
diff --git a/bacnet-stack/timesync.h b/bacnet-stack/include/timesync.h
similarity index 100%
rename from bacnet-stack/timesync.h
rename to bacnet-stack/include/timesync.h
diff --git a/bacnet-stack/tsm.h b/bacnet-stack/include/tsm.h
similarity index 100%
rename from bacnet-stack/tsm.h
rename to bacnet-stack/include/tsm.h
diff --git a/bacnet-stack/version.h b/bacnet-stack/include/version.h
similarity index 100%
rename from bacnet-stack/version.h
rename to bacnet-stack/include/version.h
diff --git a/bacnet-stack/whohas.h b/bacnet-stack/include/whohas.h
similarity index 100%
rename from bacnet-stack/whohas.h
rename to bacnet-stack/include/whohas.h
diff --git a/bacnet-stack/whois.h b/bacnet-stack/include/whois.h
similarity index 100%
rename from bacnet-stack/whois.h
rename to bacnet-stack/include/whois.h
diff --git a/bacnet-stack/wp.h b/bacnet-stack/include/wp.h
similarity index 100%
rename from bacnet-stack/wp.h
rename to bacnet-stack/include/wp.h
diff --git a/bacnet-stack/address.c b/bacnet-stack/src/address.c
similarity index 100%
rename from bacnet-stack/address.c
rename to bacnet-stack/src/address.c
diff --git a/bacnet-stack/apdu.c b/bacnet-stack/src/apdu.c
similarity index 100%
rename from bacnet-stack/apdu.c
rename to bacnet-stack/src/apdu.c
diff --git a/bacnet-stack/arf.c b/bacnet-stack/src/arf.c
similarity index 100%
rename from bacnet-stack/arf.c
rename to bacnet-stack/src/arf.c
diff --git a/bacnet-stack/awf.c b/bacnet-stack/src/awf.c
similarity index 100%
rename from bacnet-stack/awf.c
rename to bacnet-stack/src/awf.c
diff --git a/bacnet-stack/bacaddr.c b/bacnet-stack/src/bacaddr.c
similarity index 100%
rename from bacnet-stack/bacaddr.c
rename to bacnet-stack/src/bacaddr.c
diff --git a/bacnet-stack/bacapp.c b/bacnet-stack/src/bacapp.c
similarity index 100%
rename from bacnet-stack/bacapp.c
rename to bacnet-stack/src/bacapp.c
diff --git a/bacnet-stack/bacdcode.c b/bacnet-stack/src/bacdcode.c
similarity index 100%
rename from bacnet-stack/bacdcode.c
rename to bacnet-stack/src/bacdcode.c
diff --git a/bacnet-stack/bacerror.c b/bacnet-stack/src/bacerror.c
similarity index 100%
rename from bacnet-stack/bacerror.c
rename to bacnet-stack/src/bacerror.c
diff --git a/bacnet-stack/bacint.c b/bacnet-stack/src/bacint.c
similarity index 100%
rename from bacnet-stack/bacint.c
rename to bacnet-stack/src/bacint.c
diff --git a/bacnet-stack/bacprop.c b/bacnet-stack/src/bacprop.c
similarity index 100%
rename from bacnet-stack/bacprop.c
rename to bacnet-stack/src/bacprop.c
diff --git a/bacnet-stack/bacstr.c b/bacnet-stack/src/bacstr.c
similarity index 100%
rename from bacnet-stack/bacstr.c
rename to bacnet-stack/src/bacstr.c
diff --git a/bacnet-stack/bactext.c b/bacnet-stack/src/bactext.c
similarity index 100%
rename from bacnet-stack/bactext.c
rename to bacnet-stack/src/bactext.c
diff --git a/bacnet-stack/bigend.c b/bacnet-stack/src/bigend.c
similarity index 100%
rename from bacnet-stack/bigend.c
rename to bacnet-stack/src/bigend.c
diff --git a/bacnet-stack/bip.c b/bacnet-stack/src/bip.c
similarity index 100%
rename from bacnet-stack/bip.c
rename to bacnet-stack/src/bip.c
diff --git a/bacnet-stack/bvlc.c b/bacnet-stack/src/bvlc.c
similarity index 100%
rename from bacnet-stack/bvlc.c
rename to bacnet-stack/src/bvlc.c
diff --git a/bacnet-stack/cov.c b/bacnet-stack/src/cov.c
similarity index 100%
rename from bacnet-stack/cov.c
rename to bacnet-stack/src/cov.c
diff --git a/bacnet-stack/crc.c b/bacnet-stack/src/crc.c
similarity index 100%
rename from bacnet-stack/crc.c
rename to bacnet-stack/src/crc.c
diff --git a/bacnet-stack/datalink.c b/bacnet-stack/src/datalink.c
similarity index 100%
rename from bacnet-stack/datalink.c
rename to bacnet-stack/src/datalink.c
diff --git a/bacnet-stack/datetime.c b/bacnet-stack/src/datetime.c
similarity index 100%
rename from bacnet-stack/datetime.c
rename to bacnet-stack/src/datetime.c
diff --git a/bacnet-stack/dcc.c b/bacnet-stack/src/dcc.c
similarity index 100%
rename from bacnet-stack/dcc.c
rename to bacnet-stack/src/dcc.c
diff --git a/bacnet-stack/filename.c b/bacnet-stack/src/filename.c
similarity index 100%
rename from bacnet-stack/filename.c
rename to bacnet-stack/src/filename.c
diff --git a/bacnet-stack/iam.c b/bacnet-stack/src/iam.c
similarity index 100%
rename from bacnet-stack/iam.c
rename to bacnet-stack/src/iam.c
diff --git a/bacnet-stack/ihave.c b/bacnet-stack/src/ihave.c
similarity index 100%
rename from bacnet-stack/ihave.c
rename to bacnet-stack/src/ihave.c
diff --git a/bacnet-stack/indtext.c b/bacnet-stack/src/indtext.c
similarity index 100%
rename from bacnet-stack/indtext.c
rename to bacnet-stack/src/indtext.c
diff --git a/bacnet-stack/key.c b/bacnet-stack/src/key.c
similarity index 100%
rename from bacnet-stack/key.c
rename to bacnet-stack/src/key.c
diff --git a/bacnet-stack/keylist.c b/bacnet-stack/src/keylist.c
similarity index 100%
rename from bacnet-stack/keylist.c
rename to bacnet-stack/src/keylist.c
diff --git a/bacnet-stack/mstp.c b/bacnet-stack/src/mstp.c
similarity index 100%
rename from bacnet-stack/mstp.c
rename to bacnet-stack/src/mstp.c
diff --git a/bacnet-stack/mstptext.c b/bacnet-stack/src/mstptext.c
similarity index 100%
rename from bacnet-stack/mstptext.c
rename to bacnet-stack/src/mstptext.c
diff --git a/bacnet-stack/npdu.c b/bacnet-stack/src/npdu.c
similarity index 100%
rename from bacnet-stack/npdu.c
rename to bacnet-stack/src/npdu.c
diff --git a/bacnet-stack/rd.c b/bacnet-stack/src/rd.c
similarity index 100%
rename from bacnet-stack/rd.c
rename to bacnet-stack/src/rd.c
diff --git a/bacnet-stack/reject.c b/bacnet-stack/src/reject.c
similarity index 100%
rename from bacnet-stack/reject.c
rename to bacnet-stack/src/reject.c
diff --git a/bacnet-stack/ringbuf.c b/bacnet-stack/src/ringbuf.c
similarity index 100%
rename from bacnet-stack/ringbuf.c
rename to bacnet-stack/src/ringbuf.c
diff --git a/bacnet-stack/rp.c b/bacnet-stack/src/rp.c
similarity index 100%
rename from bacnet-stack/rp.c
rename to bacnet-stack/src/rp.c
diff --git a/bacnet-stack/rpm.c b/bacnet-stack/src/rpm.c
similarity index 100%
rename from bacnet-stack/rpm.c
rename to bacnet-stack/src/rpm.c
diff --git a/bacnet-stack/sbuf.c b/bacnet-stack/src/sbuf.c
similarity index 100%
rename from bacnet-stack/sbuf.c
rename to bacnet-stack/src/sbuf.c
diff --git a/bacnet-stack/timesync.c b/bacnet-stack/src/timesync.c
similarity index 100%
rename from bacnet-stack/timesync.c
rename to bacnet-stack/src/timesync.c
diff --git a/bacnet-stack/tsm.c b/bacnet-stack/src/tsm.c
similarity index 100%
rename from bacnet-stack/tsm.c
rename to bacnet-stack/src/tsm.c
diff --git a/bacnet-stack/version.c b/bacnet-stack/src/version.c
similarity index 100%
rename from bacnet-stack/version.c
rename to bacnet-stack/src/version.c
diff --git a/bacnet-stack/whohas.c b/bacnet-stack/src/whohas.c
similarity index 100%
rename from bacnet-stack/whohas.c
rename to bacnet-stack/src/whohas.c
diff --git a/bacnet-stack/whois.c b/bacnet-stack/src/whois.c
similarity index 100%
rename from bacnet-stack/whois.c
rename to bacnet-stack/src/whois.c
diff --git a/bacnet-stack/wp.c b/bacnet-stack/src/wp.c
similarity index 100%
rename from bacnet-stack/wp.c
rename to bacnet-stack/src/wp.c