Renamed files/classes, ran through pep8 and pylint