component/ bundle restructuring