fixed import headers and setup.py