Merge pull request #1 from alexhoneygosky/master

Initial check in of code from alex
moved files around to avoid too many nested folders
Merge pull request #2 from nwwatson/master

moved files around to avoid too many nested folders