renaming files so that actually mean something
Cleaning up source to conform to PEP8