Restructured CSS and Sass files