move fields around for v1