Cleanup cli syntax, fix package import
fix other cli imports