More module reshuffling