Reorganize the documentation

Will close issue #257 and #273 
I see you have almost exactly what I just wrote above - use whatever wording you like better :)