Re-Org leftover

Don't know why this didn't get included in the last commit but here
goes nuthin'.