Packages renamed and sorted. Empty databases added