Reorganize userguide

WIP