more restructuring of field and particle solver