Simplified the database structure and adapted the import/export functions

2 jobs for 17-simplification-of-the-database-structure in 1 minute and 14 seconds (queued for 2 seconds)