Refactoring of all classes
change doc