Better docs structure and minor fixes