Some changes about dirs