Re-organizing a little bit.