first commit for the reorganization branch
Merge pull request #26 from vincent-gros/reorganization

first commit for the reorganization branch