directory reorg
Merge pull request #205 from pfraze/reorg

directory reorg