CHG: Restructure everything
Merge pull request #14 from awkward/restructure

CHG: Restructure everything