Renaming files to fit naming scheme
Merge pull request #2 from Isosceles/master

File cleanup.