refactor(angular-hint-interpolation): change file names and structure of files
fix(readme.md): fix merge conflicts