factories package renamed to model