Fix modules order