Rename file utils -> extensions
Model refactoring