Changed directory structure and imports to be compatible with distutils