Fix circular imports
Fix setup.py installation handling