Heavy refactoring

Splitted in many projects