Finish swapping remainder of repos with OctOS repos