Restructure hierarchy.