Reuse interpolateProvider, icon error

Rename some files and controllers/modules (small changes)