Reorganizing doc system.
Fixes issue #301