Reorganize SASS files and add two new functions