Modified Sass files to be more modular