Data base model

Removed some unused class and add the data base model