Re-organizes userguide package structure. This doesn't seem to break lin...

...ks.

Tested with jekyll --server --safe --no-auto