Big cleanup, and change to seperate the two databases.
Add missing import.