Removed bower and split things up