more shuffling and renaming.  now we have a reasonable stub to let us in