Reorganized structure a bit.