Organizing things a little better.