Revamped sass structure