Removed unnecessary models and merged data and db classes.