Adds new hierarchy for classes/modules

similar to previous commit with a different hierarchy