delete default scope and refactor code
rename tables