Move some stuff around in org docs, fix a sample-code issue