Clean up Ch5
Sperate geom module