Refactor packages to reduce coupling (Ca, Ce) in anticipation of design refactoring [ci skip]