Minor organization updates.