Account for reorg of modules directory in 7.2