Reorganize for dependency cleanliness!