Refactoring mfg lot material for better mfg support later