Much work clarifying module code
More work separating Corpus from Modules