Move bs2bzsurf method to Base class, remove geom.h and geom.cpp.