New subdirectory structure
Merge pull request #2 from pchanson/master

New subdirectory structure