Partial Refactoring Identity existing classes