diff --git a/bacnet-stack/abort.mak b/bacnet-stack/test/abort.mak
similarity index 100%
rename from bacnet-stack/abort.mak
rename to bacnet-stack/test/abort.mak
diff --git a/bacnet-stack/address.mak b/bacnet-stack/test/address.mak
similarity index 100%
rename from bacnet-stack/address.mak
rename to bacnet-stack/test/address.mak
diff --git a/bacnet-stack/arf.mak b/bacnet-stack/test/arf.mak
similarity index 100%
rename from bacnet-stack/arf.mak
rename to bacnet-stack/test/arf.mak
diff --git a/bacnet-stack/awf.mak b/bacnet-stack/test/awf.mak
similarity index 100%
rename from bacnet-stack/awf.mak
rename to bacnet-stack/test/awf.mak
diff --git a/bacnet-stack/bacapp.mak b/bacnet-stack/test/bacapp.mak
similarity index 100%
rename from bacnet-stack/bacapp.mak
rename to bacnet-stack/test/bacapp.mak
diff --git a/bacnet-stack/bacdcode.mak b/bacnet-stack/test/bacdcode.mak
similarity index 100%
rename from bacnet-stack/bacdcode.mak
rename to bacnet-stack/test/bacdcode.mak
diff --git a/bacnet-stack/bacerror.mak b/bacnet-stack/test/bacerror.mak
similarity index 100%
rename from bacnet-stack/bacerror.mak
rename to bacnet-stack/test/bacerror.mak
diff --git a/bacnet-stack/bacint.mak b/bacnet-stack/test/bacint.mak
similarity index 100%
rename from bacnet-stack/bacint.mak
rename to bacnet-stack/test/bacint.mak
diff --git a/bacnet-stack/bacstr.mak b/bacnet-stack/test/bacstr.mak
similarity index 100%
rename from bacnet-stack/bacstr.mak
rename to bacnet-stack/test/bacstr.mak
diff --git a/bacnet-stack/bvlc.mak b/bacnet-stack/test/bvlc.mak
similarity index 100%
rename from bacnet-stack/bvlc.mak
rename to bacnet-stack/test/bvlc.mak
diff --git a/bacnet-stack/cov.mak b/bacnet-stack/test/cov.mak
similarity index 100%
rename from bacnet-stack/cov.mak
rename to bacnet-stack/test/cov.mak
diff --git a/bacnet-stack/crc.mak b/bacnet-stack/test/crc.mak
similarity index 100%
rename from bacnet-stack/crc.mak
rename to bacnet-stack/test/crc.mak
diff --git a/bacnet-stack/datetime.mak b/bacnet-stack/test/datetime.mak
similarity index 100%
rename from bacnet-stack/datetime.mak
rename to bacnet-stack/test/datetime.mak
diff --git a/bacnet-stack/dcc.mak b/bacnet-stack/test/dcc.mak
similarity index 100%
rename from bacnet-stack/dcc.mak
rename to bacnet-stack/test/dcc.mak
diff --git a/bacnet-stack/filename.mak b/bacnet-stack/test/filename.mak
similarity index 100%
rename from bacnet-stack/filename.mak
rename to bacnet-stack/test/filename.mak
diff --git a/bacnet-stack/iam.mak b/bacnet-stack/test/iam.mak
similarity index 100%
rename from bacnet-stack/iam.mak
rename to bacnet-stack/test/iam.mak
diff --git a/bacnet-stack/ihave.mak b/bacnet-stack/test/ihave.mak
similarity index 100%
rename from bacnet-stack/ihave.mak
rename to bacnet-stack/test/ihave.mak
diff --git a/bacnet-stack/indtext.mak b/bacnet-stack/test/indtext.mak
similarity index 100%
rename from bacnet-stack/indtext.mak
rename to bacnet-stack/test/indtext.mak
diff --git a/bacnet-stack/keylist.mak b/bacnet-stack/test/keylist.mak
similarity index 100%
rename from bacnet-stack/keylist.mak
rename to bacnet-stack/test/keylist.mak
diff --git a/bacnet-stack/mstp.mak b/bacnet-stack/test/mstp.mak
similarity index 100%
rename from bacnet-stack/mstp.mak
rename to bacnet-stack/test/mstp.mak
diff --git a/bacnet-stack/npdu.mak b/bacnet-stack/test/npdu.mak
similarity index 100%
rename from bacnet-stack/npdu.mak
rename to bacnet-stack/test/npdu.mak
diff --git a/bacnet-stack/rd.mak b/bacnet-stack/test/rd.mak
similarity index 100%
rename from bacnet-stack/rd.mak
rename to bacnet-stack/test/rd.mak
diff --git a/bacnet-stack/reject.mak b/bacnet-stack/test/reject.mak
similarity index 100%
rename from bacnet-stack/reject.mak
rename to bacnet-stack/test/reject.mak
diff --git a/bacnet-stack/ringbuf.mak b/bacnet-stack/test/ringbuf.mak
similarity index 100%
rename from bacnet-stack/ringbuf.mak
rename to bacnet-stack/test/ringbuf.mak
diff --git a/bacnet-stack/rp.mak b/bacnet-stack/test/rp.mak
similarity index 100%
rename from bacnet-stack/rp.mak
rename to bacnet-stack/test/rp.mak
diff --git a/bacnet-stack/rpm.mak b/bacnet-stack/test/rpm.mak
similarity index 100%
rename from bacnet-stack/rpm.mak
rename to bacnet-stack/test/rpm.mak
diff --git a/bacnet-stack/sbuf.mak b/bacnet-stack/test/sbuf.mak
similarity index 100%
rename from bacnet-stack/sbuf.mak
rename to bacnet-stack/test/sbuf.mak
diff --git a/bacnet-stack/timesync.mak b/bacnet-stack/test/timesync.mak
similarity index 100%
rename from bacnet-stack/timesync.mak
rename to bacnet-stack/test/timesync.mak
diff --git a/bacnet-stack/tsm.mak b/bacnet-stack/test/tsm.mak
similarity index 100%
rename from bacnet-stack/tsm.mak
rename to bacnet-stack/test/tsm.mak
diff --git a/bacnet-stack/whohas.mak b/bacnet-stack/test/whohas.mak
similarity index 100%
rename from bacnet-stack/whohas.mak
rename to bacnet-stack/test/whohas.mak
diff --git a/bacnet-stack/whois.mak b/bacnet-stack/test/whois.mak
similarity index 100%
rename from bacnet-stack/whois.mak
rename to bacnet-stack/test/whois.mak
diff --git a/bacnet-stack/wp.mak b/bacnet-stack/test/wp.mak
similarity index 100%
rename from bacnet-stack/wp.mak
rename to bacnet-stack/test/wp.mak