Update extracting definition by CUI
Rearrange sourse folders