Clean up, filename changes
Merge pull request #1 from jamesfe/master

Clean up, filename changes