Restructure everything
Merge pull request #1 from live627/master2

Restructure everything