Restructure for PyPi