Reorganization with new Geometry/ section
Cleanup