Fix flake8 errors.
Fix flake8 errors.
Remove source folder.
Initial work on fixing model.