Organize source a bit.