Refactoring ProjectiveStructure and SurfaceSplineConstrainer