new module structure, added historical code