Restructure for distutils