finished reorganizing geometry toolkit code