moved various toolkit code pieces
moved around geom code
reorganized more geom code
more reorganizing
continued moving around geometry toolkit code
moved around geom code