giza: additional modeling
giza: configuration code reorganization