Updated Model for latest DB schema. Removed all unnecessary duplicate files and commenting