refactor model namespace