Rearrange require statements