Finish reorganizing existing examples