Restructuration of AST