Refactor package so that model package is one generated from XSD