Renaming Wrapper in models and adding table to it

To avoid confusion, renaming Wrapper in DataBase