Moved GeometricObjects to hazardlib and some cleanurp