Merging sax structures

Merging branches as the refactoring of data structures with almost identical functionality is finished.