Rearrange module order for easy placement on external builds