Tidying classes in src/simulator/geometry/*