basically, move things around so documentation is in the correct place, and bump appropriate functions into the 'compat' section.