Update dir structure. Remove Esc key patch.