Converted Village to class

Also updated files which used it.