3.7.0 Complete editing tool

Also separated shape & tool code out into folders