Reorganizing CSS modules (WIP)