adjusting package more coherently to OOP logic