Reorganizing the AST module.