rename files
some cleanup
Merge pull request #1 from bubaflub/cleanup

Cleanup:
Merging in Bbubaflub's changes.