Improved and completed AST definitions
Almost completed parsing. Added headers