Refactor, adding bundling of javascript and css