Mapped new databases.
Renamed mapping for old ones according to new package structure.