Reorganized structure again.