Improved file organization
Merge pull request #1 from mlunsford1980/reorg

Improved file organization