Love the data driven approach through graph clustering, instead of jumping into opinionated refactoring.