Restructured files.
Merge pull request #2 from davemun/master

Restructured files.