Adjusted names so SCSS file structure makes more sense