seperated renaming into seperate class