New directory layout
Merge pull request #4 from hschin/enhance/directory

New directory layout