Wibi 1748b modifications to work

Split into two commits, the first has just the base file moves.  The second has the modifications to make all of this stuff to work in Wibi.

The commit message will need to strip the Wibi jira item prior to pushing.