[TASK] Move FieldControl/ListModule handling to module