Reorganizing CSS