Refactor the classes into more descriptive packages.