removed files not being modularised in this wave; extracted inch-geometry-base