Organizing things a bit.