Updated to work with bower and npm installation