reorganized the files again and actually included the setup.py