Removed unnecessary files from PyPI package
Fixed merge
Fixed distribution settings