Further refactoring. Removed MachineModel definitions from Assembly.