Restructure
Merge pull request #1 from limejelly/master

Restructure