Rename 'GeometryHandler' to 'Builders'
Remove unused include