Bug fixes, substantially reorganize botanist & tangram puzzle code