refactor class name, add Tree part