organize model / software field partials
some new software fields
refactor inventory method