Reorganized a few things.