re-orged sass sturcture