Combining two codebases, the hard way