Restructured packages
Database entry loading done.