diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile
index ea2a107c..acc9f22a 100644
--- a/bacnet-stack/lib/Makefile
+++ b/bacnet-stack/lib/Makefile
@@ -27,11 +27,11 @@ CFLAGS  = -Wall -g $(INCLUDES) $(DEFINES)
 CORE_SRC = \
 	$(BACNET_CORE)/apdu.c \
 	$(BACNET_CORE)/npdu.c \
-	$(BACNET_CORE)/bacdcode.c \
-	$(BACNET_CORE)/bacint.c \
-	$(BACNET_CORE)/bacapp.c \
-	$(BACNET_CORE)/bacprop.c \
-	$(BACNET_CORE)/bacstr.c \
+	$(BACNET_CORE)/bacdcode/bacdcode.c \
+	$(BACNET_CORE)/bacdcode/bacint.c \
+	$(BACNET_CORE)/bacdcode/bacstr.c \
+	$(BACNET_CORE)/bacapp.c \
+	$(BACNET_CORE)/bacprop.c \
 	$(BACNET_CORE)/bactext.c \
 	$(BACNET_CORE)/datetime.c \
 	$(BACNET_CORE)/indtext.c \
diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32
index ec1aef01..d59161d5 100644
--- a/bacnet-stack/lib/makefile.b32
+++ b/bacnet-stack/lib/makefile.b32
@@ -37,11 +37,11 @@ INCLUDES = \
 
 CORE1_SRC = $(BACNET_CORE)\apdu.c \
 	$(BACNET_CORE)\npdu.c \
-	$(BACNET_CORE)\bacdcode.c \
-	$(BACNET_CORE)\bacint.c \
+	$(BACNET_CORE)\bacdcode\bacdcode.c \
+	$(BACNET_CORE)\bacdcode\bacint.c \
+	$(BACNET_CORE)\bacdcode\bacstr.c \
 	$(BACNET_CORE)\bacapp.c \
 	$(BACNET_CORE)\bacprop.c \
-	$(BACNET_CORE)\bacstr.c \
 	$(BACNET_CORE)\bactext.c \
 	$(BACNET_CORE)\datetime.c \
 	$(BACNET_CORE)\indtext.c \
diff --git a/bacnet-stack/src/bacdcode.c b/bacnet-stack/src/bacdcode/bacdcode.c
similarity index 100%
rename from bacnet-stack/src/bacdcode.c
rename to bacnet-stack/src/bacdcode/bacdcode.c
diff --git a/bacnet-stack/test/bacdcode.mak b/bacnet-stack/src/bacdcode/bacdcode.mak
similarity index 100%
rename from bacnet-stack/test/bacdcode.mak
rename to bacnet-stack/src/bacdcode/bacdcode.mak
diff --git a/bacnet-stack/src/bacint.c b/bacnet-stack/src/bacdcode/bacint.c
similarity index 100%
rename from bacnet-stack/src/bacint.c
rename to bacnet-stack/src/bacdcode/bacint.c
diff --git a/bacnet-stack/test/bacint.mak b/bacnet-stack/src/bacdcode/bacint.mak
similarity index 100%
rename from bacnet-stack/test/bacint.mak
rename to bacnet-stack/src/bacdcode/bacint.mak
diff --git a/bacnet-stack/src/bacstr.c b/bacnet-stack/src/bacdcode/bacstr.c
similarity index 100%
rename from bacnet-stack/src/bacstr.c
rename to bacnet-stack/src/bacdcode/bacstr.c
diff --git a/bacnet-stack/test/bacstr.mak b/bacnet-stack/src/bacdcode/bacstr.mak
similarity index 100%
rename from bacnet-stack/test/bacstr.mak
rename to bacnet-stack/src/bacdcode/bacstr.mak