Cleanup User model
Remove the test files temporary
Rename the model