Continued RexConnect module refactoring.