Some changes to folders names