Update to v7.0.1 & re-organize structure
Merge pull request #3 from chancedowns/v7

Update to v7.0.1 & re-organize structure