New module reordering code has been partially implemented