Fix circular import
Update doc with changelog
Fix packaging issues