reorganization
Merge pull request #3 from Clodo76/master

reorganization