Repackage/refactor to accomodate the first module: merge.