Reorganized the repo
Merge pull request #982 from jaypoulz/jp923

Reorganized the repo