reorg git mv'ed files
reorg updated import paths
Update README.md
Update README.md
Merge pull request #57 from jaredwilkening/master

code reorganisation