New sub-module for extracted connector
Completed decoupling sub-modules
TODO: tests are not always in the right sub-module