Make package imports fully qualified