Rearrange, add setting docs