Fixed SJT to use the new module structure.