Layout tweaks, fix DBDATA confusion.

DB_DIR is for actual db data, DBDATA is for configuration location.