Updated sass organization