diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile
index 59d914fc6..057e07363 100644
--- a/libsrc/geos-cbm/Makefile
+++ b/libsrc/geos-cbm/Makefile
@@ -50,7 +50,6 @@ DIRS =	common		\
 	disk		\
 	file		\
 	memory		\
-	mousesprite	\
 	process		\
 	runtime		\
 	system
diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile
index be86b288f..7751ec811 100644
--- a/libsrc/geos-common/Makefile
+++ b/libsrc/geos-common/Makefile
@@ -33,7 +33,8 @@ DIRS =	dlgbox		\
 	file		\
 	graph		\
 	memory		\
-	menuicon
+	menuicon	\
+	mousesprite
 
 #--------------------------------------------------------------------------
 # Directives
diff --git a/libsrc/geos-cbm/mousesprite/Makefile b/libsrc/geos-common/mousesprite/Makefile
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/Makefile
rename to libsrc/geos-common/mousesprite/Makefile
diff --git a/libsrc/geos-cbm/mousesprite/clearmousemode.s b/libsrc/geos-common/mousesprite/clearmousemode.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/clearmousemode.s
rename to libsrc/geos-common/mousesprite/clearmousemode.s
diff --git a/libsrc/geos-cbm/mousesprite/disablsprite.s b/libsrc/geos-common/mousesprite/disablsprite.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/disablsprite.s
rename to libsrc/geos-common/mousesprite/disablsprite.s
diff --git a/libsrc/geos-cbm/mousesprite/drawsprite.s b/libsrc/geos-common/mousesprite/drawsprite.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/drawsprite.s
rename to libsrc/geos-common/mousesprite/drawsprite.s
diff --git a/libsrc/geos-cbm/mousesprite/enablsprite.s b/libsrc/geos-common/mousesprite/enablsprite.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/enablsprite.s
rename to libsrc/geos-common/mousesprite/enablsprite.s
diff --git a/libsrc/geos-cbm/mousesprite/getnextchar.s b/libsrc/geos-common/mousesprite/getnextchar.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/getnextchar.s
rename to libsrc/geos-common/mousesprite/getnextchar.s
diff --git a/libsrc/geos-cbm/mousesprite/inittextprompt.s b/libsrc/geos-common/mousesprite/inittextprompt.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/inittextprompt.s
rename to libsrc/geos-common/mousesprite/inittextprompt.s
diff --git a/libsrc/geos-cbm/mousesprite/ismseinregion.s b/libsrc/geos-common/mousesprite/ismseinregion.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/ismseinregion.s
rename to libsrc/geos-common/mousesprite/ismseinregion.s
diff --git a/libsrc/geos-cbm/mousesprite/mouse.s b/libsrc/geos-common/mousesprite/mouse.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/mouse.s
rename to libsrc/geos-common/mousesprite/mouse.s
diff --git a/libsrc/geos-cbm/mousesprite/mouseoff.s b/libsrc/geos-common/mousesprite/mouseoff.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/mouseoff.s
rename to libsrc/geos-common/mousesprite/mouseoff.s
diff --git a/libsrc/geos-cbm/mousesprite/mouseup.s b/libsrc/geos-common/mousesprite/mouseup.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/mouseup.s
rename to libsrc/geos-common/mousesprite/mouseup.s
diff --git a/libsrc/geos-cbm/mousesprite/possprite.s b/libsrc/geos-common/mousesprite/possprite.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/possprite.s
rename to libsrc/geos-common/mousesprite/possprite.s
diff --git a/libsrc/geos-cbm/mousesprite/promptoff.s b/libsrc/geos-common/mousesprite/promptoff.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/promptoff.s
rename to libsrc/geos-common/mousesprite/promptoff.s
diff --git a/libsrc/geos-cbm/mousesprite/prompton.s b/libsrc/geos-common/mousesprite/prompton.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/prompton.s
rename to libsrc/geos-common/mousesprite/prompton.s
diff --git a/libsrc/geos-cbm/mousesprite/startmousemode.s b/libsrc/geos-common/mousesprite/startmousemode.s
similarity index 100%
rename from libsrc/geos-cbm/mousesprite/startmousemode.s
rename to libsrc/geos-common/mousesprite/startmousemode.s