diff --git a/add_lib/SConscript b/builtin_xforms/add_lib/SConscript
similarity index 100%
rename from add_lib/SConscript
rename to builtin_xforms/add_lib/SConscript
diff --git a/add_lib/SConstruct b/builtin_xforms/add_lib/SConstruct
similarity index 100%
rename from add_lib/SConstruct
rename to builtin_xforms/add_lib/SConstruct
diff --git a/add_lib/al.cpp b/builtin_xforms/add_lib/al.cpp
similarity index 100%
rename from add_lib/al.cpp
rename to builtin_xforms/add_lib/al.cpp
diff --git a/add_lib/al.hpp b/builtin_xforms/add_lib/al.hpp
similarity index 100%
rename from add_lib/al.hpp
rename to builtin_xforms/add_lib/al.hpp
diff --git a/add_lib/al_driver.cpp b/builtin_xforms/add_lib/al_driver.cpp
similarity index 100%
rename from add_lib/al_driver.cpp
rename to builtin_xforms/add_lib/al_driver.cpp
diff --git a/add_lib/tests/test_spec.sh b/builtin_xforms/add_lib/tests/test_spec.sh
similarity index 100%
rename from add_lib/tests/test_spec.sh
rename to builtin_xforms/add_lib/tests/test_spec.sh
diff --git a/move_globals/SConscript b/builtin_xforms/move_globals/SConscript
similarity index 100%
rename from move_globals/SConscript
rename to builtin_xforms/move_globals/SConscript
diff --git a/move_globals/SConstruct b/builtin_xforms/move_globals/SConstruct
similarity index 100%
rename from move_globals/SConstruct
rename to builtin_xforms/move_globals/SConstruct
diff --git a/move_globals/mg.cpp b/builtin_xforms/move_globals/mg.cpp
similarity index 100%
rename from move_globals/mg.cpp
rename to builtin_xforms/move_globals/mg.cpp
diff --git a/move_globals/mg.hpp b/builtin_xforms/move_globals/mg.hpp
similarity index 100%
rename from move_globals/mg.hpp
rename to builtin_xforms/move_globals/mg.hpp
diff --git a/move_globals/mg_driver.cpp b/builtin_xforms/move_globals/mg_driver.cpp
similarity index 100%
rename from move_globals/mg_driver.cpp
rename to builtin_xforms/move_globals/mg_driver.cpp
diff --git a/move_globals/tests/test_spec.sh b/builtin_xforms/move_globals/tests/test_spec.sh
similarity index 100%
rename from move_globals/tests/test_spec.sh
rename to builtin_xforms/move_globals/tests/test_spec.sh
diff --git a/p1transform/AnnotationBoundaryGenerator.cpp b/builtin_xforms/p1transform/AnnotationBoundaryGenerator.cpp
similarity index 100%
rename from p1transform/AnnotationBoundaryGenerator.cpp
rename to builtin_xforms/p1transform/AnnotationBoundaryGenerator.cpp
diff --git a/p1transform/AnnotationBoundaryGenerator.hpp b/builtin_xforms/p1transform/AnnotationBoundaryGenerator.hpp
similarity index 100%
rename from p1transform/AnnotationBoundaryGenerator.hpp
rename to builtin_xforms/p1transform/AnnotationBoundaryGenerator.hpp
diff --git a/p1transform/DirectOffsetInference.cpp b/builtin_xforms/p1transform/DirectOffsetInference.cpp
similarity index 100%
rename from p1transform/DirectOffsetInference.cpp
rename to builtin_xforms/p1transform/DirectOffsetInference.cpp
diff --git a/p1transform/DirectOffsetInference.hpp b/builtin_xforms/p1transform/DirectOffsetInference.hpp
similarity index 100%
rename from p1transform/DirectOffsetInference.hpp
rename to builtin_xforms/p1transform/DirectOffsetInference.hpp
diff --git a/p1transform/EhUpdater.cpp b/builtin_xforms/p1transform/EhUpdater.cpp
similarity index 100%
rename from p1transform/EhUpdater.cpp
rename to builtin_xforms/p1transform/EhUpdater.cpp
diff --git a/p1transform/EhUpdater.hpp b/builtin_xforms/p1transform/EhUpdater.hpp
similarity index 100%
rename from p1transform/EhUpdater.hpp
rename to builtin_xforms/p1transform/EhUpdater.hpp
diff --git a/p1transform/General_Utility.cpp b/builtin_xforms/p1transform/General_Utility.cpp
similarity index 100%
rename from p1transform/General_Utility.cpp
rename to builtin_xforms/p1transform/General_Utility.cpp
diff --git a/p1transform/General_Utility.hpp b/builtin_xforms/p1transform/General_Utility.hpp
similarity index 100%
rename from p1transform/General_Utility.hpp
rename to builtin_xforms/p1transform/General_Utility.hpp
diff --git a/p1transform/OffsetInference.cpp b/builtin_xforms/p1transform/OffsetInference.cpp
similarity index 100%
rename from p1transform/OffsetInference.cpp
rename to builtin_xforms/p1transform/OffsetInference.cpp
diff --git a/p1transform/OffsetInference.hpp b/builtin_xforms/p1transform/OffsetInference.hpp
similarity index 100%
rename from p1transform/OffsetInference.hpp
rename to builtin_xforms/p1transform/OffsetInference.hpp
diff --git a/p1transform/P1Inference.cpp b/builtin_xforms/p1transform/P1Inference.cpp
similarity index 100%
rename from p1transform/P1Inference.cpp
rename to builtin_xforms/p1transform/P1Inference.cpp
diff --git a/p1transform/P1Inference.hpp b/builtin_xforms/p1transform/P1Inference.hpp
similarity index 100%
rename from p1transform/P1Inference.hpp
rename to builtin_xforms/p1transform/P1Inference.hpp
diff --git a/p1transform/P1_utility.cpp b/builtin_xforms/p1transform/P1_utility.cpp
similarity index 100%
rename from p1transform/P1_utility.cpp
rename to builtin_xforms/p1transform/P1_utility.cpp
diff --git a/p1transform/P1_utility.hpp b/builtin_xforms/p1transform/P1_utility.hpp
similarity index 100%
rename from p1transform/P1_utility.hpp
rename to builtin_xforms/p1transform/P1_utility.hpp
diff --git a/p1transform/PNIrdbManager.cpp b/builtin_xforms/p1transform/PNIrdbManager.cpp
similarity index 100%
rename from p1transform/PNIrdbManager.cpp
rename to builtin_xforms/p1transform/PNIrdbManager.cpp
diff --git a/p1transform/PNIrdbManager.hpp b/builtin_xforms/p1transform/PNIrdbManager.hpp
similarity index 100%
rename from p1transform/PNIrdbManager.hpp
rename to builtin_xforms/p1transform/PNIrdbManager.hpp
diff --git a/p1transform/PNMain.cpp b/builtin_xforms/p1transform/PNMain.cpp
similarity index 100%
rename from p1transform/PNMain.cpp
rename to builtin_xforms/p1transform/PNMain.cpp
diff --git a/p1transform/PNRange.cpp b/builtin_xforms/p1transform/PNRange.cpp
similarity index 100%
rename from p1transform/PNRange.cpp
rename to builtin_xforms/p1transform/PNRange.cpp
diff --git a/p1transform/PNRange.hpp b/builtin_xforms/p1transform/PNRange.hpp
similarity index 100%
rename from p1transform/PNRange.hpp
rename to builtin_xforms/p1transform/PNRange.hpp
diff --git a/p1transform/PNRegularExpressions.cpp b/builtin_xforms/p1transform/PNRegularExpressions.cpp
similarity index 100%
rename from p1transform/PNRegularExpressions.cpp
rename to builtin_xforms/p1transform/PNRegularExpressions.cpp
diff --git a/p1transform/PNRegularExpressions.hpp b/builtin_xforms/p1transform/PNRegularExpressions.hpp
similarity index 100%
rename from p1transform/PNRegularExpressions.hpp
rename to builtin_xforms/p1transform/PNRegularExpressions.hpp
diff --git a/p1transform/PNStackLayout.cpp b/builtin_xforms/p1transform/PNStackLayout.cpp
similarity index 100%
rename from p1transform/PNStackLayout.cpp
rename to builtin_xforms/p1transform/PNStackLayout.cpp
diff --git a/p1transform/PNStackLayout.hpp b/builtin_xforms/p1transform/PNStackLayout.hpp
similarity index 100%
rename from p1transform/PNStackLayout.hpp
rename to builtin_xforms/p1transform/PNStackLayout.hpp
diff --git a/p1transform/PNStackLayoutInference.hpp b/builtin_xforms/p1transform/PNStackLayoutInference.hpp
similarity index 100%
rename from p1transform/PNStackLayoutInference.hpp
rename to builtin_xforms/p1transform/PNStackLayoutInference.hpp
diff --git a/p1transform/PNTransformDriver.cpp b/builtin_xforms/p1transform/PNTransformDriver.cpp
similarity index 100%
rename from p1transform/PNTransformDriver.cpp
rename to builtin_xforms/p1transform/PNTransformDriver.cpp
diff --git a/p1transform/PNTransformDriver.hpp b/builtin_xforms/p1transform/PNTransformDriver.hpp
similarity index 100%
rename from p1transform/PNTransformDriver.hpp
rename to builtin_xforms/p1transform/PNTransformDriver.hpp
diff --git a/p1transform/PrecedenceBoundaryGenerator.hpp b/builtin_xforms/p1transform/PrecedenceBoundaryGenerator.hpp
similarity index 100%
rename from p1transform/PrecedenceBoundaryGenerator.hpp
rename to builtin_xforms/p1transform/PrecedenceBoundaryGenerator.hpp
diff --git a/p1transform/PrecedenceBoundaryInference.cpp b/builtin_xforms/p1transform/PrecedenceBoundaryInference.cpp
similarity index 100%
rename from p1transform/PrecedenceBoundaryInference.cpp
rename to builtin_xforms/p1transform/PrecedenceBoundaryInference.cpp
diff --git a/p1transform/PrecedenceBoundaryInference.hpp b/builtin_xforms/p1transform/PrecedenceBoundaryInference.hpp
similarity index 100%
rename from p1transform/PrecedenceBoundaryInference.hpp
rename to builtin_xforms/p1transform/PrecedenceBoundaryInference.hpp
diff --git a/p1transform/Range.cpp b/builtin_xforms/p1transform/Range.cpp
similarity index 100%
rename from p1transform/Range.cpp
rename to builtin_xforms/p1transform/Range.cpp
diff --git a/p1transform/Range.hpp b/builtin_xforms/p1transform/Range.hpp
similarity index 100%
rename from p1transform/Range.hpp
rename to builtin_xforms/p1transform/Range.hpp
diff --git a/p1transform/SConscript b/builtin_xforms/p1transform/SConscript
similarity index 100%
rename from p1transform/SConscript
rename to builtin_xforms/p1transform/SConscript
diff --git a/p1transform/SConstruct b/builtin_xforms/p1transform/SConstruct
similarity index 100%
rename from p1transform/SConstruct
rename to builtin_xforms/p1transform/SConstruct
diff --git a/p1transform/ScaledOffsetInference.cpp b/builtin_xforms/p1transform/ScaledOffsetInference.cpp
similarity index 100%
rename from p1transform/ScaledOffsetInference.cpp
rename to builtin_xforms/p1transform/ScaledOffsetInference.cpp
diff --git a/p1transform/ScaledOffsetInference.hpp b/builtin_xforms/p1transform/ScaledOffsetInference.hpp
similarity index 100%
rename from p1transform/ScaledOffsetInference.hpp
rename to builtin_xforms/p1transform/ScaledOffsetInference.hpp
diff --git a/p1transform/StackLayout.cpp b/builtin_xforms/p1transform/StackLayout.cpp
similarity index 100%
rename from p1transform/StackLayout.cpp
rename to builtin_xforms/p1transform/StackLayout.cpp
diff --git a/p1transform/StackLayout.hpp b/builtin_xforms/p1transform/StackLayout.hpp
similarity index 100%
rename from p1transform/StackLayout.hpp
rename to builtin_xforms/p1transform/StackLayout.hpp
diff --git a/p1transform/canary.h b/builtin_xforms/p1transform/canary.h
similarity index 100%
rename from p1transform/canary.h
rename to builtin_xforms/p1transform/canary.h
diff --git a/p1transform/globals.h b/builtin_xforms/p1transform/globals.h
similarity index 100%
rename from p1transform/globals.h
rename to builtin_xforms/p1transform/globals.h
diff --git a/p1transform/integertransformdriver.cpp b/builtin_xforms/p1transform/integertransformdriver.cpp
similarity index 100%
rename from p1transform/integertransformdriver.cpp
rename to builtin_xforms/p1transform/integertransformdriver.cpp
diff --git a/p1transform/nulltransform.cpp b/builtin_xforms/p1transform/nulltransform.cpp
similarity index 100%
rename from p1transform/nulltransform.cpp
rename to builtin_xforms/p1transform/nulltransform.cpp
diff --git a/p1transform/sample_meds_int.annot b/builtin_xforms/p1transform/sample_meds_int.annot
similarity index 100%
rename from p1transform/sample_meds_int.annot
rename to builtin_xforms/p1transform/sample_meds_int.annot
diff --git a/p1transform/tests/test_buffer_overflow.c b/builtin_xforms/p1transform/tests/test_buffer_overflow.c
similarity index 100%
rename from p1transform/tests/test_buffer_overflow.c
rename to builtin_xforms/p1transform/tests/test_buffer_overflow.c
diff --git a/p1transform/tests/test_buffer_overflow.sh b/builtin_xforms/p1transform/tests/test_buffer_overflow.sh
similarity index 100%
rename from p1transform/tests/test_buffer_overflow.sh
rename to builtin_xforms/p1transform/tests/test_buffer_overflow.sh
diff --git a/p1transform/tests/test_spec-x32.sh b/builtin_xforms/p1transform/tests/test_spec-x32.sh
similarity index 100%
rename from p1transform/tests/test_spec-x32.sh
rename to builtin_xforms/p1transform/tests/test_spec-x32.sh
diff --git a/p1transform/tests/test_spec.sh b/builtin_xforms/p1transform/tests/test_spec.sh
similarity index 100%
rename from p1transform/tests/test_spec.sh
rename to builtin_xforms/p1transform/tests/test_spec.sh
diff --git a/p1transform/tests/test_spec17.sh b/builtin_xforms/p1transform/tests/test_spec17.sh
similarity index 100%
rename from p1transform/tests/test_spec17.sh
rename to builtin_xforms/p1transform/tests/test_spec17.sh
diff --git a/p1transform/transformutils.cpp b/builtin_xforms/p1transform/transformutils.cpp
similarity index 100%
rename from p1transform/transformutils.cpp
rename to builtin_xforms/p1transform/transformutils.cpp
diff --git a/p1transform/transformutils.h b/builtin_xforms/p1transform/transformutils.h
similarity index 100%
rename from p1transform/transformutils.h
rename to builtin_xforms/p1transform/transformutils.h
diff --git a/resolve_callbacks/SConscript b/builtin_xforms/resolve_callbacks/SConscript
similarity index 100%
rename from resolve_callbacks/SConscript
rename to builtin_xforms/resolve_callbacks/SConscript
diff --git a/resolve_callbacks/SConstruct b/builtin_xforms/resolve_callbacks/SConstruct
similarity index 100%
rename from resolve_callbacks/SConstruct
rename to builtin_xforms/resolve_callbacks/SConstruct
diff --git a/resolve_callbacks/callbacks.cpp b/builtin_xforms/resolve_callbacks/callbacks.cpp
similarity index 100%
rename from resolve_callbacks/callbacks.cpp
rename to builtin_xforms/resolve_callbacks/callbacks.cpp
diff --git a/resolve_callbacks/callbacks.hpp b/builtin_xforms/resolve_callbacks/callbacks.hpp
similarity index 100%
rename from resolve_callbacks/callbacks.hpp
rename to builtin_xforms/resolve_callbacks/callbacks.hpp
diff --git a/resolve_callbacks/callbacks_driver.cpp b/builtin_xforms/resolve_callbacks/callbacks_driver.cpp
similarity index 100%
rename from resolve_callbacks/callbacks_driver.cpp
rename to builtin_xforms/resolve_callbacks/callbacks_driver.cpp