Reorganize CSS heirarchy