taking out several programs in proto to put them in "official" places