Completely refactoring CSS organization