restructure the whole thing

14 jobs for 136-tidy-up-geometry in 11 minutes and 44 seconds (queued for 2 seconds)