Change imports Strategy
Fix package imports
tweaks
bump version