removing old hierarchy for AO modules