Merge "Refactor neutrong state and module (part 1)"