Rearranged to use distutils