[WIP][issue #83] UML and documentation modified, and code cleaned