Split general fields and note fields into separate modules.