Clean up directory structure and use distutils