diff --git a/bacnet-stack/ports/at91sam7s/makefile b/bacnet-stack/ports/at91sam7s/makefile
index 50b47657..2de448a8 100644
--- a/bacnet-stack/ports/at91sam7s/makefile
+++ b/bacnet-stack/ports/at91sam7s/makefile
@@ -60,11 +60,11 @@ DEMOSRC = ai.c \
 	$(BACNET_DEMO)/handler/h_dcc.c
 
 CORESRC = $(BACNET_CORE)/npdu.c \
-	$(BACNET_CORE)/bacint.c \
 	$(BACNET_CORE)/apdu.c \
-	$(BACNET_CORE)/bacdcode.c \
+	$(BACNET_CORE)/bacdcode/bacint.c \
+	$(BACNET_CORE)/bacdcode/bacdcode.c \
+	$(BACNET_CORE)/bacdcode/bacstr.c \
 	$(BACNET_CORE)/bacaddr.c \
-	$(BACNET_CORE)/bacstr.c \
 	$(BACNET_CORE)/abort.c \
 	$(BACNET_CORE)/bacerror.c \
 	$(BACNET_CORE)/reject.c \
diff --git a/bacnet-stack/ports/atmega168/Makefile b/bacnet-stack/ports/atmega168/Makefile
index d4c4f6f1..ddb466a4 100644
--- a/bacnet-stack/ports/atmega168/Makefile
+++ b/bacnet-stack/ports/atmega168/Makefile
@@ -36,11 +36,11 @@ DEMOSRC = h_rp.c \
 CORESRC =  \
 	$(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 \