new structure

change folder and db class