Module refactor; wrap suites