Add `with-eval-after-load' for Org
Add `with-eval-after-load' wrappers around Org code

Move some Org code snippets around.
Add code wrappers, and indent correctly
Replace last `eval-after-load'
Replace the last `eval-after-load'
Reindent code correctly