Move field declaration to where it belongs