Move things around.
Renames and adding DB support to RTB.