fixed package/directory structure
Merge pull request #1 from burtbeckwith/master

fixed package/directory structure