Moved and fixed villagers