Cleaned up code
Added data_files to setup call