Reorganized the code for better support of data structures parsing.

5 files changed