Oops. Forgot to include some files in the reorg.