made several to file organization and performed a lot of cleanup per feedback from Cam
Merge pull request #123 from stateoflux/master

made several to file organization and performed a lot of cleanup per fee...