diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile
index 1c37df814..628990591 100644
--- a/libsrc/geos-cbm/Makefile
+++ b/libsrc/geos-cbm/Makefile
@@ -44,8 +44,7 @@ CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 #--------------------------------------------------------------------------
 # Directories
 
-DIRS =	common		\
-	conio		\
+DIRS =	conio		\
 	devel		\
 	disk		\
 	file		\
diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile
index 2f01b87cd..3a2bfbd60 100644
--- a/libsrc/geos-common/Makefile
+++ b/libsrc/geos-common/Makefile
@@ -29,7 +29,8 @@ CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 #--------------------------------------------------------------------------
 # Directories
 
-DIRS =	dlgbox		\
+DIRS =	common		\
+	dlgbox		\
 	disk		\
 	file		\
 	graph		\
diff --git a/libsrc/geos-cbm/common/Makefile b/libsrc/geos-common/common/Makefile
similarity index 100%
rename from libsrc/geos-cbm/common/Makefile
rename to libsrc/geos-common/common/Makefile
diff --git a/libsrc/geos-cbm/common/_afailed.c b/libsrc/geos-common/common/_afailed.c
similarity index 100%
rename from libsrc/geos-cbm/common/_afailed.c
rename to libsrc/geos-common/common/_afailed.c
diff --git a/libsrc/geos-cbm/common/_poserror.c b/libsrc/geos-common/common/_poserror.c
similarity index 100%
rename from libsrc/geos-cbm/common/_poserror.c
rename to libsrc/geos-common/common/_poserror.c
diff --git a/libsrc/geos-cbm/common/abort.c b/libsrc/geos-common/common/abort.c
similarity index 100%
rename from libsrc/geos-cbm/common/abort.c
rename to libsrc/geos-common/common/abort.c
diff --git a/libsrc/geos-cbm/common/copydata.s b/libsrc/geos-common/common/copydata.s
similarity index 100%
rename from libsrc/geos-cbm/common/copydata.s
rename to libsrc/geos-common/common/copydata.s
diff --git a/libsrc/geos-cbm/common/memcpy.s b/libsrc/geos-common/common/memcpy.s
similarity index 100%
rename from libsrc/geos-cbm/common/memcpy.s
rename to libsrc/geos-common/common/memcpy.s
diff --git a/libsrc/geos-cbm/common/memmove.s b/libsrc/geos-common/common/memmove.s
similarity index 100%
rename from libsrc/geos-cbm/common/memmove.s
rename to libsrc/geos-common/common/memmove.s
diff --git a/libsrc/geos-cbm/common/memset.s b/libsrc/geos-common/common/memset.s
similarity index 100%
rename from libsrc/geos-cbm/common/memset.s
rename to libsrc/geos-common/common/memset.s
diff --git a/libsrc/geos-cbm/common/perror.c b/libsrc/geos-common/common/perror.c
similarity index 100%
rename from libsrc/geos-cbm/common/perror.c
rename to libsrc/geos-common/common/perror.c
diff --git a/libsrc/geos-cbm/common/sleep.c b/libsrc/geos-common/common/sleep.c
similarity index 100%
rename from libsrc/geos-cbm/common/sleep.c
rename to libsrc/geos-common/common/sleep.c
diff --git a/libsrc/geos-cbm/common/zerobss.s b/libsrc/geos-common/common/zerobss.s
similarity index 100%
rename from libsrc/geos-cbm/common/zerobss.s
rename to libsrc/geos-common/common/zerobss.s