reverted package move-around to avoid package cycles