Updated hierarchy to match Shell curriculum