reoragnize code structure
dbfiles: partial