moved model package out