Restructure program
Merge pull request #1 from river226/master

Update Structure