All modules changed to new style.