Refactor village information