Update structure, add foldes!