Cms refactor and Bower support