renamed and moved things around to make it easier to use when imported
Merge pull request #1 from d136o/master

renamed and moved things around to make it easier to use when imported