Restructure sass