Reorganize packages for dependency cleanliness!