Added cutlist, change structure