Reorganised SASS files