Refactor imports. Added Composite gestion in WS.

Some code commented which do not want to compile... but seems good...