Part two of DB realignment.

Signed-off-by: SkyFire <admin@projectskyfire.org>