Core Changes Address review feedback: extract modules, clean up imports: #90813 Credits Huge thanks to @sokra for helping!