Add bower and refactor