diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile
index 6d388b40..7d9a96b8 100644
--- a/bacnet-stack/lib/Makefile
+++ b/bacnet-stack/lib/Makefile
@@ -40,7 +40,7 @@ CORE_SRC = \
 	$(BACNET_CORE)/awf.c \
 	$(BACNET_CORE)/cov.c \
 	$(BACNET_CORE)/dcc.c \
-	$(BACNET_CORE)/iam.c \
+	$(BACNET_CORE)/iam/iam.c \
 	$(BACNET_CORE)/ihave.c \
 	$(BACNET_CORE)/rd.c \
 	$(BACNET_CORE)/rp.c \
diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32
index 4053d98f..fd9f5ea1 100644
--- a/bacnet-stack/lib/makefile.b32
+++ b/bacnet-stack/lib/makefile.b32
@@ -59,7 +59,7 @@ CORE2_SRC = $(BACNET_CORE)\arf.c \
 	$(BACNET_CORE)\awf.c \
 	$(BACNET_CORE)\cov.c \
 	$(BACNET_CORE)\dcc.c \
-	$(BACNET_CORE)\iam.c \
+	$(BACNET_CORE)\iam\iam.c \
 	$(BACNET_CORE)\ihave.c \
 	$(BACNET_CORE)\rd.c \
 	$(BACNET_CORE)\rp.c \
diff --git a/bacnet-stack/src/iam.c b/bacnet-stack/src/iam/iam.c
similarity index 100%
rename from bacnet-stack/src/iam.c
rename to bacnet-stack/src/iam/iam.c