rebuilt database structure, created new models