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