Adjusted filenames and setup.py