Reorganize the documentation

Will close issue #257 and #273 
Agreed and updated :)