database structure reworked
database reworked