Fixes #1 : correct source layout