Reorganized some things.