Use a single source folder
Merge pull request #24 from aMarcireau/refactor

Use a single source folder