Sort accordions #36

Commit of DB structure also include other older forgotten changes.
Should be up to date in this submit.