Improve module structure.