file reorginizatoin
merged in master
Merge pull request #16 from kevinchabreck/file_reorg

File reorg