update file structure and database structure fix #32