Package reorganization for model and mirror classes