Migration to yeec and leex