Move fields to village table