DOC Better structure. Better documentation