Revert "big refactoring should be included now !"

This reverts commit 18c4b532c2fc6ee6c437419fc41172126db9f533.