restructured stuff for distutils