Code cleaning
Rewriting classes + CMD interface
More Changes