diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile
index 628990591..8c1a056be 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 =	conio		\
-	devel		\
+DIRS =	devel		\
 	disk		\
 	file		\
 	memory		\
diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile
index 3a2bfbd60..695ba5fde 100644
--- a/libsrc/geos-common/Makefile
+++ b/libsrc/geos-common/Makefile
@@ -30,6 +30,7 @@ CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 # Directories
 
 DIRS =	common		\
+	conio		\
 	dlgbox		\
 	disk		\
 	file		\
diff --git a/libsrc/geos-cbm/conio/Makefile b/libsrc/geos-common/conio/Makefile
similarity index 100%
rename from libsrc/geos-cbm/conio/Makefile
rename to libsrc/geos-common/conio/Makefile
diff --git a/libsrc/geos-cbm/conio/_scrsize.s b/libsrc/geos-common/conio/_scrsize.s
similarity index 100%
rename from libsrc/geos-cbm/conio/_scrsize.s
rename to libsrc/geos-common/conio/_scrsize.s
diff --git a/libsrc/geos-cbm/conio/cclear.s b/libsrc/geos-common/conio/cclear.s
similarity index 100%
rename from libsrc/geos-cbm/conio/cclear.s
rename to libsrc/geos-common/conio/cclear.s
diff --git a/libsrc/geos-cbm/conio/cgetc.s b/libsrc/geos-common/conio/cgetc.s
similarity index 100%
rename from libsrc/geos-cbm/conio/cgetc.s
rename to libsrc/geos-common/conio/cgetc.s
diff --git a/libsrc/geos-cbm/conio/chline.s b/libsrc/geos-common/conio/chline.s
similarity index 100%
rename from libsrc/geos-cbm/conio/chline.s
rename to libsrc/geos-common/conio/chline.s
diff --git a/libsrc/geos-cbm/conio/clrscr.s b/libsrc/geos-common/conio/clrscr.s
similarity index 100%
rename from libsrc/geos-cbm/conio/clrscr.s
rename to libsrc/geos-common/conio/clrscr.s
diff --git a/libsrc/geos-cbm/conio/color.s b/libsrc/geos-common/conio/color.s
similarity index 100%
rename from libsrc/geos-cbm/conio/color.s
rename to libsrc/geos-common/conio/color.s
diff --git a/libsrc/geos-cbm/conio/cpputs.s b/libsrc/geos-common/conio/cpputs.s
similarity index 100%
rename from libsrc/geos-cbm/conio/cpputs.s
rename to libsrc/geos-common/conio/cpputs.s
diff --git a/libsrc/geos-cbm/conio/cputc.s b/libsrc/geos-common/conio/cputc.s
similarity index 100%
rename from libsrc/geos-cbm/conio/cputc.s
rename to libsrc/geos-common/conio/cputc.s
diff --git a/libsrc/geos-cbm/conio/cursor.s b/libsrc/geos-common/conio/cursor.s
similarity index 100%
rename from libsrc/geos-cbm/conio/cursor.s
rename to libsrc/geos-common/conio/cursor.s
diff --git a/libsrc/geos-cbm/conio/cvline.s b/libsrc/geos-common/conio/cvline.s
similarity index 100%
rename from libsrc/geos-cbm/conio/cvline.s
rename to libsrc/geos-common/conio/cvline.s
diff --git a/libsrc/geos-cbm/conio/gotoxy.s b/libsrc/geos-common/conio/gotoxy.s
similarity index 100%
rename from libsrc/geos-cbm/conio/gotoxy.s
rename to libsrc/geos-common/conio/gotoxy.s
diff --git a/libsrc/geos-cbm/conio/kbhit.s b/libsrc/geos-common/conio/kbhit.s
similarity index 100%
rename from libsrc/geos-cbm/conio/kbhit.s
rename to libsrc/geos-common/conio/kbhit.s
diff --git a/libsrc/geos-cbm/conio/revers.s b/libsrc/geos-common/conio/revers.s
similarity index 100%
rename from libsrc/geos-cbm/conio/revers.s
rename to libsrc/geos-common/conio/revers.s
diff --git a/libsrc/geos-cbm/conio/where.s b/libsrc/geos-common/conio/where.s
similarity index 100%
rename from libsrc/geos-cbm/conio/where.s
rename to libsrc/geos-common/conio/where.s