diff --git a/apps/sam/c/doc/whatsnew.txt b/apps/sam/c/doc/whatsnew.txt
index 65af0705e0840597f7394d89292509f34145a935..e76de5ba17fb0ef95fd2e0d015801d24cbff7833 100644
--- a/apps/sam/c/doc/whatsnew.txt
+++ b/apps/sam/c/doc/whatsnew.txt
@@ -1,5 +1,8 @@
 /* vi:set ts=4: */
 
+v1.30
+	* Added SAM_BAD_STYLE error
+
 v1.25	2004-07-31
 	* Created I2P-Ping, a new example program (it's a clone of I2Ping).  Works
 		on Posix only, because it uses getopt().
diff --git a/apps/sam/c/examples/Makefile.common b/apps/sam/c/examples/warhammer/Makefile.common
similarity index 100%
rename from apps/sam/c/examples/Makefile.common
rename to apps/sam/c/examples/warhammer/Makefile.common
diff --git a/apps/sam/c/examples/Makefile.mingw b/apps/sam/c/examples/warhammer/Makefile.mingw
similarity index 90%
rename from apps/sam/c/examples/Makefile.mingw
rename to apps/sam/c/examples/warhammer/Makefile.mingw
index ddf9f10c3ee15347adc8854dec439c54943d54c3..414a0d9df3c3a257a7838ff6741d2836627ef91d 100644
--- a/apps/sam/c/examples/Makefile.mingw
+++ b/apps/sam/c/examples/warhammer/Makefile.mingw
@@ -15,7 +15,7 @@ RM = C:\Dev-Cpp\bin\rm
 
 CFLAGS = -g -O2 -pipe -std=c99 -Wall
 CFLAGS += -DWINSOCK
-CFLAGS += -I../inc -L../lib
+CFLAGS += -I../../inc -L../../lib
 LIBS = -lsam -lwsock32
 
 #
diff --git a/apps/sam/c/examples/Makefile.posix b/apps/sam/c/examples/warhammer/Makefile.posix
similarity index 88%
rename from apps/sam/c/examples/Makefile.posix
rename to apps/sam/c/examples/warhammer/Makefile.posix
index 5f153e745caf00d65652b95a5f6cd75472995551..4ff834f57635daf25f2f5efa8951a982f2aa4025 100644
--- a/apps/sam/c/examples/Makefile.posix
+++ b/apps/sam/c/examples/warhammer/Makefile.posix
@@ -14,7 +14,7 @@ RM = rm
 #
 
 CFLAGS = -g -O2 -pipe -std=c99 -Wall
-CFLAGS += -I../inc -L../lib
+CFLAGS += -I../../inc -L../../lib
 LIBS = -lsam
 
 #
diff --git a/apps/sam/c/examples/warhammer-dgram.c b/apps/sam/c/examples/warhammer/warhammer-dgram.c
similarity index 100%
rename from apps/sam/c/examples/warhammer-dgram.c
rename to apps/sam/c/examples/warhammer/warhammer-dgram.c