Several improvements:
Several improvements:

* Remove persistent_id from container items
* Fix for duplicate container items in database
* Improve code layout.

ties/SubDaap,basilfx/SubDaap,basilfx/SubDaap,ties/SubDaap