Move code to new location
Update movefields method calls