Refactor mappings to avoid name conflicts

(e.g. name mappings for file.js and file.css no longer conflict)
Add asset path in directive errors