Fix order of modules