Reworked to support setup
fixed setup.py
fixing setup