Reorganized the scss files