diff --git a/libsrc/geos-cbm/graph/Makefile b/libsrc/geos-common/graph/Makefile
similarity index 100%
rename from libsrc/geos-cbm/graph/Makefile
rename to libsrc/geos-common/graph/Makefile
diff --git a/libsrc/geos-cbm/graph/bitmapclip.s b/libsrc/geos-common/graph/bitmapclip.s
similarity index 100%
rename from libsrc/geos-cbm/graph/bitmapclip.s
rename to libsrc/geos-common/graph/bitmapclip.s
diff --git a/libsrc/geos-cbm/graph/bitmapregs.s b/libsrc/geos-common/graph/bitmapregs.s
similarity index 100%
rename from libsrc/geos-cbm/graph/bitmapregs.s
rename to libsrc/geos-common/graph/bitmapregs.s
diff --git a/libsrc/geos-cbm/graph/bitmapup.s b/libsrc/geos-common/graph/bitmapup.s
similarity index 100%
rename from libsrc/geos-cbm/graph/bitmapup.s
rename to libsrc/geos-common/graph/bitmapup.s
diff --git a/libsrc/geos-cbm/graph/bitotherclip.s b/libsrc/geos-common/graph/bitotherclip.s
similarity index 100%
rename from libsrc/geos-cbm/graph/bitotherclip.s
rename to libsrc/geos-common/graph/bitotherclip.s
diff --git a/libsrc/geos-cbm/graph/drawline.s b/libsrc/geos-common/graph/drawline.s
similarity index 100%
rename from libsrc/geos-cbm/graph/drawline.s
rename to libsrc/geos-common/graph/drawline.s
diff --git a/libsrc/geos-cbm/graph/drawpoint.s b/libsrc/geos-common/graph/drawpoint.s
similarity index 100%
rename from libsrc/geos-cbm/graph/drawpoint.s
rename to libsrc/geos-common/graph/drawpoint.s
diff --git a/libsrc/geos-cbm/graph/framerectangle.s b/libsrc/geos-common/graph/framerectangle.s
similarity index 100%
rename from libsrc/geos-cbm/graph/framerectangle.s
rename to libsrc/geos-common/graph/framerectangle.s
diff --git a/libsrc/geos-cbm/graph/getcharwidth.s b/libsrc/geos-common/graph/getcharwidth.s
similarity index 100%
rename from libsrc/geos-cbm/graph/getcharwidth.s
rename to libsrc/geos-common/graph/getcharwidth.s
diff --git a/libsrc/geos-cbm/graph/getintcharint.s b/libsrc/geos-common/graph/getintcharint.s
similarity index 100%
rename from libsrc/geos-cbm/graph/getintcharint.s
rename to libsrc/geos-common/graph/getintcharint.s
diff --git a/libsrc/geos-cbm/graph/graphicsstring.s b/libsrc/geos-common/graph/graphicsstring.s
similarity index 100%
rename from libsrc/geos-cbm/graph/graphicsstring.s
rename to libsrc/geos-common/graph/graphicsstring.s
diff --git a/libsrc/geos-cbm/graph/hlineregs.s b/libsrc/geos-common/graph/hlineregs.s
similarity index 100%
rename from libsrc/geos-cbm/graph/hlineregs.s
rename to libsrc/geos-common/graph/hlineregs.s
diff --git a/libsrc/geos-cbm/graph/horizontalline.s b/libsrc/geos-common/graph/horizontalline.s
similarity index 100%
rename from libsrc/geos-cbm/graph/horizontalline.s
rename to libsrc/geos-common/graph/horizontalline.s
diff --git a/libsrc/geos-cbm/graph/imprintrectangle.s b/libsrc/geos-common/graph/imprintrectangle.s
similarity index 100%
rename from libsrc/geos-cbm/graph/imprintrectangle.s
rename to libsrc/geos-common/graph/imprintrectangle.s
diff --git a/libsrc/geos-cbm/graph/initdrawwindow.s b/libsrc/geos-common/graph/initdrawwindow.s
similarity index 100%
rename from libsrc/geos-cbm/graph/initdrawwindow.s
rename to libsrc/geos-common/graph/initdrawwindow.s
diff --git a/libsrc/geos-cbm/graph/invertline.s b/libsrc/geos-common/graph/invertline.s
similarity index 100%
rename from libsrc/geos-cbm/graph/invertline.s
rename to libsrc/geos-common/graph/invertline.s
diff --git a/libsrc/geos-cbm/graph/invertrectangle.s b/libsrc/geos-common/graph/invertrectangle.s
similarity index 100%
rename from libsrc/geos-cbm/graph/invertrectangle.s
rename to libsrc/geos-common/graph/invertrectangle.s
diff --git a/libsrc/geos-cbm/graph/loadcharset.s b/libsrc/geos-common/graph/loadcharset.s
similarity index 100%
rename from libsrc/geos-cbm/graph/loadcharset.s
rename to libsrc/geos-common/graph/loadcharset.s
diff --git a/libsrc/geos-cbm/graph/pointregs.s b/libsrc/geos-common/graph/pointregs.s
similarity index 100%
rename from libsrc/geos-cbm/graph/pointregs.s
rename to libsrc/geos-common/graph/pointregs.s
diff --git a/libsrc/geos-cbm/graph/put_char.s b/libsrc/geos-common/graph/put_char.s
similarity index 100%
rename from libsrc/geos-cbm/graph/put_char.s
rename to libsrc/geos-common/graph/put_char.s
diff --git a/libsrc/geos-cbm/graph/putdecimal.s b/libsrc/geos-common/graph/putdecimal.s
similarity index 100%
rename from libsrc/geos-cbm/graph/putdecimal.s
rename to libsrc/geos-common/graph/putdecimal.s
diff --git a/libsrc/geos-cbm/graph/putstring.s b/libsrc/geos-common/graph/putstring.s
similarity index 100%
rename from libsrc/geos-cbm/graph/putstring.s
rename to libsrc/geos-common/graph/putstring.s
diff --git a/libsrc/geos-cbm/graph/recoverline.s b/libsrc/geos-common/graph/recoverline.s
similarity index 100%
rename from libsrc/geos-cbm/graph/recoverline.s
rename to libsrc/geos-common/graph/recoverline.s
diff --git a/libsrc/geos-cbm/graph/recoverrectangle.s b/libsrc/geos-common/graph/recoverrectangle.s
similarity index 100%
rename from libsrc/geos-cbm/graph/recoverrectangle.s
rename to libsrc/geos-common/graph/recoverrectangle.s
diff --git a/libsrc/geos-cbm/graph/rectangle.s b/libsrc/geos-common/graph/rectangle.s
similarity index 100%
rename from libsrc/geos-cbm/graph/rectangle.s
rename to libsrc/geos-common/graph/rectangle.s
diff --git a/libsrc/geos-cbm/graph/setpattern.s b/libsrc/geos-common/graph/setpattern.s
similarity index 100%
rename from libsrc/geos-cbm/graph/setpattern.s
rename to libsrc/geos-common/graph/setpattern.s
diff --git a/libsrc/geos-cbm/graph/testpoint.s b/libsrc/geos-common/graph/testpoint.s
similarity index 100%
rename from libsrc/geos-cbm/graph/testpoint.s
rename to libsrc/geos-common/graph/testpoint.s
diff --git a/libsrc/geos-cbm/graph/usesystemfont.s b/libsrc/geos-common/graph/usesystemfont.s
similarity index 100%
rename from libsrc/geos-cbm/graph/usesystemfont.s
rename to libsrc/geos-common/graph/usesystemfont.s
diff --git a/libsrc/geos-cbm/graph/verticalline.s b/libsrc/geos-common/graph/verticalline.s
similarity index 100%
rename from libsrc/geos-cbm/graph/verticalline.s
rename to libsrc/geos-common/graph/verticalline.s