Renamed some files to make things a bit more pythonic.