Add modularization/cognitive refactoring to TODOs
Add modularization/cognitive refactoring to TODOs

gaurav-rygbee/ritzy,gaurav-rygbee/ritzy,gaurav-rygbee/ritzy,shaunstanislaus/ritzy,deepti2200/ritzy,lihan/ritzy,yakovenkodenis/ritzy,ritzyed/ritzy,guiquanz/ritzy,sangohan/ritzy,deepti2200/ritzy,guiquanz/ritzy,shaunstanislaus/ritzy,guiquanz/ritzy,eiriklv/ritzy,sangohan/ritzy,sangohan/ritzy,shaunstanislaus/ritzy,ritzyed/ritzy,eiriklv/ritzy,eiriklv/ritzy,yakovenkodenis/ritzy,lihan/ritzy,yakovenkodenis/ritzy,ritzyed/ritzy,deepti2200/ritzy,lihan/ritzy