Added some structure to SASS