Clean Up

Made Hierarchy easier to navigate and collapse.