Moved around some packages, started optimizing CSG tree traversal