Hierarchy revamp

Makes it a bit more organized