reorganization at my side
Merge pull request #7 from badeleux/master

reorganization at my side