diff --git a/ase/awk/awk.h b/ase/awk/awk.h
index 26cf6049..a17fcd6b 100644
--- a/ase/awk/awk.h
+++ b/ase/awk/awk.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: awk.h,v 1.202 2007-03-05 14:58:36 bacon Exp $
+ * $Id: awk.h,v 1.203 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
@@ -7,8 +7,8 @@
 #ifndef _ASE_AWK_AWK_H_
 #define _ASE_AWK_AWK_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 typedef struct ase_awk_t ase_awk_t;
 typedef struct ase_awk_run_t ase_awk_run_t;
diff --git a/ase/awk/rex.c b/ase/awk/rex.c
index 6132793f..9ef6b64c 100644
--- a/ase/awk/rex.c
+++ b/ase/awk/rex.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rex.c,v 1.77 2007-03-03 13:22:01 bacon Exp $
+ * $Id: rex.c,v 1.78 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
@@ -128,7 +128,7 @@ struct match_t
 	const ase_byte_t* branch_end;
 };
 
-#include <ase/pack.h>
+#include <ase/cmn/pack.h>
 
 ASE_BEGIN_PACKED_STRUCT (code_t)
 	/*ase_byte_t cmd;*/
@@ -156,7 +156,7 @@ ASE_BEGIN_PACKED_STRUCT (cshdr_t)
 	ase_size_t csl; /* length */
 ASE_END_PACKED_STRUCT ()
 
-#include <ase/unpack.h>
+#include <ase/cmn/unpack.h>
 
 typedef const ase_byte_t* (*atom_matcher_t) (
 	matcher_t* matcher, const ase_byte_t* base, match_t* mat);
diff --git a/ase/awk/rex.h b/ase/awk/rex.h
index d4ed2f48..92eb7141 100644
--- a/ase/awk/rex.h
+++ b/ase/awk/rex.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rex.h,v 1.27 2007-02-28 11:00:32 bacon Exp $
+ * $Id: rex.h,v 1.28 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
@@ -7,9 +7,9 @@
 #ifndef _ASE_AWK_REX_H_
 #define _ASE_AWK_REX_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
-
+#ifndef _ASE_AWK_AWK_H_
+#error Never include this file directly. Include <ase/awk/awk.h> instead
+#endif
 
 /*
  * Regular Esseression Syntax
diff --git a/ase/conf_msw.h b/ase/cmn/conf_msw.h
similarity index 95%
rename from ase/conf_msw.h
rename to ase/cmn/conf_msw.h
index 0a9c7c65..b9ed999c 100644
--- a/ase/conf_msw.h
+++ b/ase/cmn/conf_msw.h
@@ -1,5 +1,5 @@
 /*
- * $Id: conf_msw.h,v 1.8 2007-02-07 14:51:44 bacon Exp $
+ * $Id: conf_msw.h,v 1.1 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
diff --git a/ase/conf_unx.h.in b/ase/cmn/conf_unx.h.in
similarity index 92%
rename from ase/conf_unx.h.in
rename to ase/cmn/conf_unx.h.in
index bacf73b7..4efb62d6 100644
--- a/ase/conf_unx.h.in
+++ b/ase/cmn/conf_unx.h.in
@@ -1,5 +1,5 @@
 /*
- * $Id: conf_unx.h.in,v 1.3 2007-02-03 10:52:36 bacon Exp $
+ * $Id: conf_unx.h.in,v 1.1 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
diff --git a/ase/conf_vms.h b/ase/cmn/conf_vms.h
similarity index 97%
rename from ase/conf_vms.h
rename to ase/cmn/conf_vms.h
index 682b0fa3..ede81843 100644
--- a/ase/conf_vms.h
+++ b/ase/cmn/conf_vms.h
@@ -1,5 +1,5 @@
 /*
- * $Id: conf_vms.h,v 1.11 2007-02-19 04:44:13 bacon Exp $
+ * $Id: conf_vms.h,v 1.1 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
diff --git a/ase/macros.h b/ase/cmn/macros.h
similarity index 97%
rename from ase/macros.h
rename to ase/cmn/macros.h
index 7733292a..cebb7362 100644
--- a/ase/macros.h
+++ b/ase/cmn/macros.h
@@ -1,5 +1,5 @@
 /*
- * $Id: macros.h,v 1.54 2007-02-24 14:32:44 bacon Exp $
+ * $Id: macros.h,v 1.1 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
@@ -7,7 +7,7 @@
 #ifndef _ASE_MACROS_H_
 #define _ASE_MACROS_H_
 
-#include <ase/types.h>
+#include <ase/cmn/types.h>
 
 #ifdef __cplusplus
 	/*#define ASE_NULL ((ase_uint_t)0)*/
diff --git a/ase/cmn/mem.h b/ase/cmn/mem.h
index a28c23ec..cc4deed3 100644
--- a/ase/cmn/mem.h
+++ b/ase/cmn/mem.h
@@ -1,5 +1,5 @@
 /*
- * $Id: mem.h,v 1.2 2007-02-23 08:17:51 bacon Exp $
+ * $Id: mem.h,v 1.3 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
@@ -7,8 +7,8 @@
 #ifndef _ASE_CMN_MEM_H_
 #define _ASE_CMN_MEM_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ase/pack.h b/ase/cmn/pack.h
similarity index 83%
rename from ase/pack.h
rename to ase/cmn/pack.h
index 06dd0f89..2b12b0a0 100644
--- a/ase/pack.h
+++ b/ase/cmn/pack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.h,v 1.6 2007-03-01 07:44:58 bacon Exp $
+ * $Id: pack.h,v 1.1 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
diff --git a/ase/cmn/str.h b/ase/cmn/str.h
index ef5618ba..cdc44e77 100644
--- a/ase/cmn/str.h
+++ b/ase/cmn/str.h
@@ -1,5 +1,5 @@
 /*
- * $Id: str.h,v 1.4 2007-03-02 11:41:55 bacon Exp $
+ * $Id: str.h,v 1.5 2007-03-06 14:16:52 bacon Exp $
  *
  * {License}
  */
@@ -7,8 +7,8 @@
 #ifndef _ASE_CMN_STR_H_
 #define _ASE_CMN_STR_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 #define ASE_STR_LEN(x)      ((x)->size)
 #define ASE_STR_SIZE(x)     ((x)->size + 1)
diff --git a/ase/types.h b/ase/cmn/types.h
similarity index 97%
rename from ase/types.h
rename to ase/cmn/types.h
index 03b0804e..efcddeab 100644
--- a/ase/types.h
+++ b/ase/cmn/types.h
@@ -1,5 +1,5 @@
 /*
- * $Id: types.h,v 1.75 2007-03-02 11:14:33 bacon Exp $
+ * $Id: types.h,v 1.1 2007-03-06 14:16:53 bacon Exp $
  *
  * {License}
  */
@@ -8,9 +8,9 @@
 #define _ASE_TYPES_H_
 
 #if defined(_WIN32)
-	#include <ase/conf_msw.h>
+	#include <ase/cmn/conf_msw.h>
 #elif defined(vms) || defined(__vms)
-	#include <ase/conf_vms.h>
+	#include <ase/cmn/conf_vms.h>
 #elif defined(__unix__) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || (defined(__APPLE__) && defined(__MACH__))
 	#if !defined(__unix__)
 		#define __unix__
@@ -18,7 +18,7 @@
 	#if !defined(__unix)
 		#define __unix
 	#endif
-	#include <ase/conf_unx.h>
+	#include <ase/cmn/conf_unx.h>
 #else
 	#error unsupported operating system
 #endif
diff --git a/ase/unpack.h b/ase/cmn/unpack.h
similarity index 82%
rename from ase/unpack.h
rename to ase/cmn/unpack.h
index 017339cf..2de58710 100644
--- a/ase/unpack.h
+++ b/ase/cmn/unpack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: unpack.h,v 1.6 2007-03-01 07:44:58 bacon Exp $
+ * $Id: unpack.h,v 1.1 2007-03-06 14:16:53 bacon Exp $
  *
  * {License}
  */
diff --git a/ase/configure b/ase/configure
index af4d1701..14d5ae22 100755
--- a/ase/configure
+++ b/ase/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.76 .
+# From configure.ac Revision: 1.77 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for ase deb-0.1.0.
 #
@@ -1304,7 +1304,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-          ac_config_headers="$ac_config_headers conf_unx.h"
+          ac_config_headers="$ac_config_headers cmn/conf_unx.h"
 
 
 # Checks for programs.
@@ -10437,7 +10437,7 @@ do
   "utl/makefile" ) CONFIG_FILES="$CONFIG_FILES utl/makefile" ;;
   "test/awk/makefile" ) CONFIG_FILES="$CONFIG_FILES test/awk/makefile" ;;
   "test/lsp/makefile" ) CONFIG_FILES="$CONFIG_FILES test/lsp/makefile" ;;
-  "conf_unx.h" ) CONFIG_HEADERS="$CONFIG_HEADERS conf_unx.h" ;;
+  "cmn/conf_unx.h" ) CONFIG_HEADERS="$CONFIG_HEADERS cmn/conf_unx.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
diff --git a/ase/configure.ac b/ase/configure.ac
index d41eb0ec..2b7c7ce8 100644
--- a/ase/configure.ac
+++ b/ase/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
 AC_INIT([ase], [deb-0.1.0])
-AC_REVISION([$Revision: 1.77 $])
-AC_CONFIG_HEADER([conf_unx.h])
+AC_REVISION([$Revision: 1.78 $])
+AC_CONFIG_HEADER([cmn/conf_unx.h])
 
 # Checks for programs.
 #AC_PROG_CXX
diff --git a/ase/lsp/lsp.h b/ase/lsp/lsp.h
index 3f610f53..9fc2813c 100644
--- a/ase/lsp/lsp.h
+++ b/ase/lsp/lsp.h
@@ -1,5 +1,5 @@
 /*
- * $Id: lsp.h,v 1.40 2007-02-24 14:32:11 bacon Exp $
+ * $Id: lsp.h,v 1.41 2007-03-06 14:16:53 bacon Exp $
  *
  * {License}
  */
@@ -7,8 +7,8 @@
 #ifndef _ASE_LSP_LSP_H_
 #define _ASE_LSP_LSP_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 typedef struct ase_lsp_t ase_lsp_t;
 typedef struct ase_lsp_obj_t ase_lsp_obj_t;
diff --git a/ase/lsp/name.h b/ase/lsp/name.h
index ac9a4855..5ac073a7 100644
--- a/ase/lsp/name.h
+++ b/ase/lsp/name.h
@@ -1,5 +1,5 @@
 /*
- * $Id: name.h,v 1.9 2007-02-03 10:51:52 bacon Exp $
+ * $Id: name.h,v 1.10 2007-03-06 14:16:53 bacon Exp $
  *
  * {License}
  */
@@ -7,8 +7,8 @@
 #ifndef _ASE_LSP_NAME_H_
 #define _ASE_LSP_NAME_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 struct ase_lsp_name_t 
 {
diff --git a/ase/makefile.in b/ase/makefile.in
index dee3f0e3..0867c33c 100644
--- a/ase/makefile.in
+++ b/ase/makefile.in
@@ -1,4 +1,4 @@
-SUBDIRS=cmn utl awk lsp
+SUBDIRS=cmn awk lsp utl
 
 all:
 	@for i in $(SUBDIRS); \
diff --git a/ase/utl/ctype.h b/ase/utl/ctype.h
index a74c0018..8c5fc55a 100644
--- a/ase/utl/ctype.h
+++ b/ase/utl/ctype.h
@@ -5,8 +5,8 @@
 #ifndef _ASE_UTL_CTYPE_H_
 #define _ASE_UTL_CTYPE_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ase/utl/main.h b/ase/utl/main.h
index 20ab61a1..cbf3059d 100644
--- a/ase/utl/main.h
+++ b/ase/utl/main.h
@@ -1,12 +1,12 @@
 /*
- * $Id: main.h,v 1.2 2007-02-22 14:32:08 bacon Exp $
+ * $Id: main.h,v 1.3 2007-03-06 14:16:53 bacon Exp $
  */
 
 #ifndef _ASE_UTL_MAIN_H_
 #define _ASE_UTL_MAIN_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 #if defined(_WIN32)
 
diff --git a/ase/utl/stdio.h b/ase/utl/stdio.h
index 39935bca..bcf13df0 100644
--- a/ase/utl/stdio.h
+++ b/ase/utl/stdio.h
@@ -1,12 +1,12 @@
 /*
- * $Id: stdio.h,v 1.5 2007-02-28 09:57:13 bacon Exp $
+ * $Id: stdio.h,v 1.6 2007-03-06 14:16:53 bacon Exp $
  */
 
 #ifndef _ASE_UTL_STDIO_H_
 #define _ASE_UTL_STDIO_H_
 
-#include <ase/types.h>
-#include <ase/macros.h>
+#include <ase/cmn/types.h>
+#include <ase/cmn/macros.h>
 
 #include <stdio.h>
 #include <stdarg.h>