Move helm etags source. Some cleanup.