diff --git a/libsrc/geos-cbm/file/Makefile b/libsrc/geos-cbm/file/Makefile
index a62f19878..a92db605e 100644
--- a/libsrc/geos-cbm/file/Makefile
+++ b/libsrc/geos-cbm/file/Makefile
@@ -5,29 +5,4 @@
 #--------------------------------------------------------------------------
 # Object files
 
-S_OBJS +=	get1stdirentry.o	\
-		getnxtdirentry.o	\
-		openrecordfile.o	\
-		closerecordfile.o	\
-		nextrecord.o		\
-		previousrecord.o	\
-		pointrecord.o		\
-		deleterecord.o		\
-		insertrecord.o		\
-		appendrecord.o		\
-		readrecord.o		\
-		writerecord.o		\
-		updaterecordfile.o	\
-		findfile.o		\
-		followchain.o		\
-		getfhdrinfo.o		\
-		readfile.o		\
-		savefile.o		\
-		freefile.o		\
-		deletefile.o		\
-		renamefile.o		\
-		findftypes.o		\
-		readbyte.o		\
-		getfile.o		\
-		sysremove.o		\
-		sysrename.o
+S_OBJS +=	followchain.o
diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile
index e884c1bd5..2e2f88ba8 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 =	dlgbox		\
+	file
 
 #--------------------------------------------------------------------------
 # Directives
diff --git a/libsrc/geos-common/file/Makefile b/libsrc/geos-common/file/Makefile
new file mode 100644
index 000000000..b9ba76208
--- /dev/null
+++ b/libsrc/geos-common/file/Makefile
@@ -0,0 +1,32 @@
+#
+# makefile for CC65 runtime library
+#
+
+#--------------------------------------------------------------------------
+# Object files
+
+S_OBJS +=	get1stdirentry.o	\
+		getnxtdirentry.o	\
+		openrecordfile.o	\
+		closerecordfile.o	\
+		nextrecord.o		\
+		previousrecord.o	\
+		pointrecord.o		\
+		deleterecord.o		\
+		insertrecord.o		\
+		appendrecord.o		\
+		readrecord.o		\
+		writerecord.o		\
+		updaterecordfile.o	\
+		findfile.o		\
+		getfhdrinfo.o		\
+		readfile.o		\
+		savefile.o		\
+		freefile.o		\
+		deletefile.o		\
+		renamefile.o		\
+		findftypes.o		\
+		readbyte.o		\
+		getfile.o		\
+		sysremove.o		\
+		sysrename.o
diff --git a/libsrc/geos-cbm/file/appendrecord.s b/libsrc/geos-common/file/appendrecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/appendrecord.s
rename to libsrc/geos-common/file/appendrecord.s
diff --git a/libsrc/geos-cbm/file/closerecordfile.s b/libsrc/geos-common/file/closerecordfile.s
similarity index 100%
rename from libsrc/geos-cbm/file/closerecordfile.s
rename to libsrc/geos-common/file/closerecordfile.s
diff --git a/libsrc/geos-cbm/file/deletefile.s b/libsrc/geos-common/file/deletefile.s
similarity index 100%
rename from libsrc/geos-cbm/file/deletefile.s
rename to libsrc/geos-common/file/deletefile.s
diff --git a/libsrc/geos-cbm/file/deleterecord.s b/libsrc/geos-common/file/deleterecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/deleterecord.s
rename to libsrc/geos-common/file/deleterecord.s
diff --git a/libsrc/geos-cbm/file/findfile.s b/libsrc/geos-common/file/findfile.s
similarity index 100%
rename from libsrc/geos-cbm/file/findfile.s
rename to libsrc/geos-common/file/findfile.s
diff --git a/libsrc/geos-cbm/file/findftypes.s b/libsrc/geos-common/file/findftypes.s
similarity index 100%
rename from libsrc/geos-cbm/file/findftypes.s
rename to libsrc/geos-common/file/findftypes.s
diff --git a/libsrc/geos-cbm/file/freefile.s b/libsrc/geos-common/file/freefile.s
similarity index 100%
rename from libsrc/geos-cbm/file/freefile.s
rename to libsrc/geos-common/file/freefile.s
diff --git a/libsrc/geos-cbm/file/get1stdirentry.s b/libsrc/geos-common/file/get1stdirentry.s
similarity index 100%
rename from libsrc/geos-cbm/file/get1stdirentry.s
rename to libsrc/geos-common/file/get1stdirentry.s
diff --git a/libsrc/geos-cbm/file/getfhdrinfo.s b/libsrc/geos-common/file/getfhdrinfo.s
similarity index 100%
rename from libsrc/geos-cbm/file/getfhdrinfo.s
rename to libsrc/geos-common/file/getfhdrinfo.s
diff --git a/libsrc/geos-cbm/file/getfile.s b/libsrc/geos-common/file/getfile.s
similarity index 100%
rename from libsrc/geos-cbm/file/getfile.s
rename to libsrc/geos-common/file/getfile.s
diff --git a/libsrc/geos-cbm/file/getnxtdirentry.s b/libsrc/geos-common/file/getnxtdirentry.s
similarity index 100%
rename from libsrc/geos-cbm/file/getnxtdirentry.s
rename to libsrc/geos-common/file/getnxtdirentry.s
diff --git a/libsrc/geos-cbm/file/insertrecord.s b/libsrc/geos-common/file/insertrecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/insertrecord.s
rename to libsrc/geos-common/file/insertrecord.s
diff --git a/libsrc/geos-cbm/file/nextrecord.s b/libsrc/geos-common/file/nextrecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/nextrecord.s
rename to libsrc/geos-common/file/nextrecord.s
diff --git a/libsrc/geos-cbm/file/openrecordfile.s b/libsrc/geos-common/file/openrecordfile.s
similarity index 100%
rename from libsrc/geos-cbm/file/openrecordfile.s
rename to libsrc/geos-common/file/openrecordfile.s
diff --git a/libsrc/geos-cbm/file/pointrecord.s b/libsrc/geos-common/file/pointrecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/pointrecord.s
rename to libsrc/geos-common/file/pointrecord.s
diff --git a/libsrc/geos-cbm/file/previousrecord.s b/libsrc/geos-common/file/previousrecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/previousrecord.s
rename to libsrc/geos-common/file/previousrecord.s
diff --git a/libsrc/geos-cbm/file/readbyte.s b/libsrc/geos-common/file/readbyte.s
similarity index 100%
rename from libsrc/geos-cbm/file/readbyte.s
rename to libsrc/geos-common/file/readbyte.s
diff --git a/libsrc/geos-cbm/file/readfile.s b/libsrc/geos-common/file/readfile.s
similarity index 100%
rename from libsrc/geos-cbm/file/readfile.s
rename to libsrc/geos-common/file/readfile.s
diff --git a/libsrc/geos-cbm/file/readrecord.s b/libsrc/geos-common/file/readrecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/readrecord.s
rename to libsrc/geos-common/file/readrecord.s
diff --git a/libsrc/geos-cbm/file/renamefile.s b/libsrc/geos-common/file/renamefile.s
similarity index 100%
rename from libsrc/geos-cbm/file/renamefile.s
rename to libsrc/geos-common/file/renamefile.s
diff --git a/libsrc/geos-cbm/file/savefile.s b/libsrc/geos-common/file/savefile.s
similarity index 100%
rename from libsrc/geos-cbm/file/savefile.s
rename to libsrc/geos-common/file/savefile.s
diff --git a/libsrc/geos-cbm/file/sysremove.s b/libsrc/geos-common/file/sysremove.s
similarity index 100%
rename from libsrc/geos-cbm/file/sysremove.s
rename to libsrc/geos-common/file/sysremove.s
diff --git a/libsrc/geos-cbm/file/sysrename.s b/libsrc/geos-common/file/sysrename.s
similarity index 100%
rename from libsrc/geos-cbm/file/sysrename.s
rename to libsrc/geos-common/file/sysrename.s
diff --git a/libsrc/geos-cbm/file/updaterecordfile.s b/libsrc/geos-common/file/updaterecordfile.s
similarity index 100%
rename from libsrc/geos-cbm/file/updaterecordfile.s
rename to libsrc/geos-common/file/updaterecordfile.s
diff --git a/libsrc/geos-cbm/file/writerecord.s b/libsrc/geos-common/file/writerecord.s
similarity index 100%
rename from libsrc/geos-cbm/file/writerecord.s
rename to libsrc/geos-common/file/writerecord.s