Rename and reorganize
Reorganize and add undo usage script