rearranged the structure
database interactive