move fields to top level