south support; refactor modules