Restructured fzXsdXpec organization
Adds support for attributes' optionality