Reorganizing some stuff.