Rework of Octree container classes