Fix order of required files