Restructure includes.
Bring back support for paper.setup('id') again, and document it properly.

Closes #510.