Reorganized some stuff.