Moving stuff around so that the main Treestore class is in the main package namespace.