Started to reformat database structure