Combined two octree files into one, cleaned up, and reordered main.py to be more logical