Externalise AST to Query rewriting as Converters
Move Expression AST objects to separate files