organize inventory/kits package
fix incorrect Nonnull annotation