Reorganize some stuff.