Refactoring, rename model and add country and code model