Restructure hierarchy