expand forest.hpp and tree.hpp