reorganize files to hopefully be more sane
Merge pull request #83 from dannycoates/reorg

reorganize files to hopefully be more sane