Rearrange the doc and document loading tasks. Closes #35