Reorganized files.
Merge pull request #2 from arthurevans/reorg

Reorganized files.