Changed the database structure with folders