Flattened structure & component.json added