Restructuring Wali & Undo/Redo Manager