Merge pull request #1 from gdpotter/master

Organized the files a bit better