Fixed setup and __init__ import