Organizing packages and more refactorings