Restructured AST hierarchy a bit