Resolve cyclic package dependencies in trade package