RotamerPacker has all its main methods in place and it compiles.
I think I fixed the merge problems.