fix package and import errors