Package / class refactoring to eliminate unwanted cycles