Reorganized core tree.