yet more restructuring...