CSS restructuring