Add Rename Feature out of context and seperated the logic to a single module