Move some files down where we'll get them when we promote the lib.

Refs #162