Cleanup. Move headers to the back instead. Add more contributors we picked.