Restructed the heirarchy.