Restructure some of compartmentalization machine.