Organize new files before #57 commit
Merge pull request #64 from mgbellaire/master

Organize new files before #57 commit