Reorganize SCSS