Restructure sass partial