Restructure our hierarchy, ideas