Moved ModelBuilder to generator
New ModelGenerator and tests
Added new ModelGenerator and tests