Output in the proper directory structure
Merge pull request #11 from guillaumep/master

Output in the proper directory structure