Refactoring of class-names and package structure