Major update on DB structure

in addition to some enhancement on login data