Reorganizing files and setting up to load to PyPI