Updated SASS files

re-arranged organization of imports