Remove unused file
Add new model and tables module