fixing package import issues