Renaming things
Deleting old files
Creating renamed files
Merge pull request #2 from fcingolani/master

Renaming