Start using distutils, changed dir structure