diff --git a/Makefile.m4 b/Makefile.m4
index d0248e9..323bb9e 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -37,8 +37,8 @@ dnl
 new_object([external/*.c])dnl
 dnl
 ifdef([target],[],[define([target],esyscmd([uname -s | xargs printf '%s']))])dnl
-syscmd([test -f ]cf/target.m4)dnl
-ifelse(sysval,[0],[include(cf/target.m4)],[errprint([M4 for your target (]cf/target.m4[) was not found, please make one
+syscmd([test -f ]m4/ostype/target.m4)dnl
+ifelse(sysval,[0],[include(m4/ostype/target.m4)],[errprint([M4 for your target (]m4/ostype/target.m4[) was not found, please make one
 ])m4exit(1)])dnl
 dnl
 include(m4/toplevel/options.m4)dnl
diff --git a/configure b/configure
index 644b856..87b4a02 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,15 @@
 #!/bin/sh
+# $Id$
 FLAGS="-Duse_freetype2 -Duse_stb_image -Dbuild_opengl -Dbuild_vulkan"
 
+for i in $@; do
+	case "$i")
+		--help|-h)
+			echo "Configuration utility for Milsko Toolkit"
+			;;
+	esac
+done
+
 if ! m4 $FLAGS Makefile.m4 > Makefile; then
 	echo "(M4 exited with non-zero status)"
 	rm -f Makefile
diff --git a/cf/Darwin.m4 b/m4/ostype/Darwin.m4
similarity index 100%
rename from cf/Darwin.m4
rename to m4/ostype/Darwin.m4
diff --git a/cf/NetBSD.m4 b/m4/ostype/NetBSD.m4
similarity index 100%
rename from cf/NetBSD.m4
rename to m4/ostype/NetBSD.m4
diff --git a/cf/Windows.m4 b/m4/ostype/Windows.m4
similarity index 100%
rename from cf/Windows.m4
rename to m4/ostype/Windows.m4