Reorganize to introduce database support.