and remove the old, badly named files
Merge pull request #2 from danisyellis/master

and remove the old, badly named files