Re-structured sass files