restructuring componenten etc