Move Bitter to upstream source