Restructure for new module structure.