diff --git a/Examples/php4/check.list b/Examples/php/check.list similarity index 100% rename from Examples/php4/check.list rename to Examples/php/check.list diff --git a/Examples/php4/class/Makefile b/Examples/php/class/Makefile similarity index 100% rename from Examples/php4/class/Makefile rename to Examples/php/class/Makefile diff --git a/Examples/php4/class/example.cxx b/Examples/php/class/example.cxx similarity index 100% rename from Examples/php4/class/example.cxx rename to Examples/php/class/example.cxx diff --git a/Examples/php4/class/example.h b/Examples/php/class/example.h similarity index 100% rename from Examples/php4/class/example.h rename to Examples/php/class/example.h diff --git a/Examples/php4/class/example.i b/Examples/php/class/example.i similarity index 100% rename from Examples/php4/class/example.i rename to Examples/php/class/example.i diff --git a/Examples/php4/class/runme.php4 b/Examples/php/class/runme.php4 similarity index 100% rename from Examples/php4/class/runme.php4 rename to Examples/php/class/runme.php4 diff --git a/Examples/php4/constants/Makefile b/Examples/php/constants/Makefile similarity index 100% rename from Examples/php4/constants/Makefile rename to Examples/php/constants/Makefile diff --git a/Examples/php4/constants/example.i b/Examples/php/constants/example.i similarity index 100% rename from Examples/php4/constants/example.i rename to Examples/php/constants/example.i diff --git a/Examples/php4/constants/runme.php4 b/Examples/php/constants/runme.php4 similarity index 100% rename from Examples/php4/constants/runme.php4 rename to Examples/php/constants/runme.php4 diff --git a/Examples/php4/cpointer/Makefile b/Examples/php/cpointer/Makefile similarity index 100% rename from Examples/php4/cpointer/Makefile rename to Examples/php/cpointer/Makefile diff --git a/Examples/php4/cpointer/example.c b/Examples/php/cpointer/example.c similarity index 100% rename from Examples/php4/cpointer/example.c rename to Examples/php/cpointer/example.c diff --git a/Examples/php4/cpointer/example.i b/Examples/php/cpointer/example.i similarity index 100% rename from Examples/php4/cpointer/example.i rename to Examples/php/cpointer/example.i diff --git a/Examples/php4/cpointer/runme.php4 b/Examples/php/cpointer/runme.php4 similarity index 100% rename from Examples/php4/cpointer/runme.php4 rename to Examples/php/cpointer/runme.php4 diff --git a/Examples/php4/disown/Makefile b/Examples/php/disown/Makefile similarity index 100% rename from Examples/php4/disown/Makefile rename to Examples/php/disown/Makefile diff --git a/Examples/php4/disown/example.cxx b/Examples/php/disown/example.cxx similarity index 100% rename from Examples/php4/disown/example.cxx rename to Examples/php/disown/example.cxx diff --git a/Examples/php4/disown/example.h b/Examples/php/disown/example.h similarity index 100% rename from Examples/php4/disown/example.h rename to Examples/php/disown/example.h diff --git a/Examples/php4/disown/example.i b/Examples/php/disown/example.i similarity index 100% rename from Examples/php4/disown/example.i rename to Examples/php/disown/example.i diff --git a/Examples/php4/disown/runme.php4 b/Examples/php/disown/runme.php4 similarity index 100% rename from Examples/php4/disown/runme.php4 rename to Examples/php/disown/runme.php4 diff --git a/Examples/php4/enum/Makefile b/Examples/php/enum/Makefile similarity index 100% rename from Examples/php4/enum/Makefile rename to Examples/php/enum/Makefile diff --git a/Examples/php4/enum/example.cxx b/Examples/php/enum/example.cxx similarity index 100% rename from Examples/php4/enum/example.cxx rename to Examples/php/enum/example.cxx diff --git a/Examples/php4/enum/example.h b/Examples/php/enum/example.h similarity index 100% rename from Examples/php4/enum/example.h rename to Examples/php/enum/example.h diff --git a/Examples/php4/enum/example.i b/Examples/php/enum/example.i similarity index 100% rename from Examples/php4/enum/example.i rename to Examples/php/enum/example.i diff --git a/Examples/php4/enum/runme.php4 b/Examples/php/enum/runme.php4 similarity index 100% rename from Examples/php4/enum/runme.php4 rename to Examples/php/enum/runme.php4 diff --git a/Examples/php4/funcptr/Makefile b/Examples/php/funcptr/Makefile similarity index 100% rename from Examples/php4/funcptr/Makefile rename to Examples/php/funcptr/Makefile diff --git a/Examples/php4/funcptr/example.c b/Examples/php/funcptr/example.c similarity index 100% rename from Examples/php4/funcptr/example.c rename to Examples/php/funcptr/example.c diff --git a/Examples/php4/funcptr/example.h b/Examples/php/funcptr/example.h similarity index 100% rename from Examples/php4/funcptr/example.h rename to Examples/php/funcptr/example.h diff --git a/Examples/php4/funcptr/example.i b/Examples/php/funcptr/example.i similarity index 100% rename from Examples/php4/funcptr/example.i rename to Examples/php/funcptr/example.i diff --git a/Examples/php4/funcptr/runme.php4 b/Examples/php/funcptr/runme.php4 similarity index 100% rename from Examples/php4/funcptr/runme.php4 rename to Examples/php/funcptr/runme.php4 diff --git a/Examples/php4/overloading/Makefile b/Examples/php/overloading/Makefile similarity index 100% rename from Examples/php4/overloading/Makefile rename to Examples/php/overloading/Makefile diff --git a/Examples/php4/overloading/example.cxx b/Examples/php/overloading/example.cxx similarity index 100% rename from Examples/php4/overloading/example.cxx rename to Examples/php/overloading/example.cxx diff --git a/Examples/php4/overloading/example.h b/Examples/php/overloading/example.h similarity index 100% rename from Examples/php4/overloading/example.h rename to Examples/php/overloading/example.h diff --git a/Examples/php4/overloading/example.i b/Examples/php/overloading/example.i similarity index 100% rename from Examples/php4/overloading/example.i rename to Examples/php/overloading/example.i diff --git a/Examples/php4/overloading/runme.php4 b/Examples/php/overloading/runme.php4 similarity index 100% rename from Examples/php4/overloading/runme.php4 rename to Examples/php/overloading/runme.php4 diff --git a/Examples/php4/pointer/Makefile b/Examples/php/pointer/Makefile similarity index 100% rename from Examples/php4/pointer/Makefile rename to Examples/php/pointer/Makefile diff --git a/Examples/php4/pointer/example.c b/Examples/php/pointer/example.c similarity index 100% rename from Examples/php4/pointer/example.c rename to Examples/php/pointer/example.c diff --git a/Examples/php4/pointer/example.i b/Examples/php/pointer/example.i similarity index 100% rename from Examples/php4/pointer/example.i rename to Examples/php/pointer/example.i diff --git a/Examples/php4/pointer/runme.php4 b/Examples/php/pointer/runme.php4 similarity index 100% rename from Examples/php4/pointer/runme.php4 rename to Examples/php/pointer/runme.php4 diff --git a/Examples/php4/pragmas/Makefile b/Examples/php/pragmas/Makefile similarity index 100% rename from Examples/php4/pragmas/Makefile rename to Examples/php/pragmas/Makefile diff --git a/Examples/php4/pragmas/example.i b/Examples/php/pragmas/example.i similarity index 100% rename from Examples/php4/pragmas/example.i rename to Examples/php/pragmas/example.i diff --git a/Examples/php4/pragmas/include.php b/Examples/php/pragmas/include.php similarity index 100% rename from Examples/php4/pragmas/include.php rename to Examples/php/pragmas/include.php diff --git a/Examples/php4/pragmas/runme.php4 b/Examples/php/pragmas/runme.php4 similarity index 100% rename from Examples/php4/pragmas/runme.php4 rename to Examples/php/pragmas/runme.php4 diff --git a/Examples/php4/proxy/Makefile b/Examples/php/proxy/Makefile similarity index 100% rename from Examples/php4/proxy/Makefile rename to Examples/php/proxy/Makefile diff --git a/Examples/php4/proxy/example.cxx b/Examples/php/proxy/example.cxx similarity index 100% rename from Examples/php4/proxy/example.cxx rename to Examples/php/proxy/example.cxx diff --git a/Examples/php4/proxy/example.h b/Examples/php/proxy/example.h similarity index 100% rename from Examples/php4/proxy/example.h rename to Examples/php/proxy/example.h diff --git a/Examples/php4/proxy/example.i b/Examples/php/proxy/example.i similarity index 100% rename from Examples/php4/proxy/example.i rename to Examples/php/proxy/example.i diff --git a/Examples/php4/proxy/runme.php4 b/Examples/php/proxy/runme.php4 similarity index 100% rename from Examples/php4/proxy/runme.php4 rename to Examples/php/proxy/runme.php4 diff --git a/Examples/php4/reference/Makefile b/Examples/php/reference/Makefile similarity index 100% rename from Examples/php4/reference/Makefile rename to Examples/php/reference/Makefile diff --git a/Examples/php4/reference/example.cxx b/Examples/php/reference/example.cxx similarity index 100% rename from Examples/php4/reference/example.cxx rename to Examples/php/reference/example.cxx diff --git a/Examples/php4/reference/example.h b/Examples/php/reference/example.h similarity index 100% rename from Examples/php4/reference/example.h rename to Examples/php/reference/example.h diff --git a/Examples/php4/reference/example.i b/Examples/php/reference/example.i similarity index 100% rename from Examples/php4/reference/example.i rename to Examples/php/reference/example.i diff --git a/Examples/php4/reference/runme-proxy.php4 b/Examples/php/reference/runme-proxy.php4 similarity index 100% rename from Examples/php4/reference/runme-proxy.php4 rename to Examples/php/reference/runme-proxy.php4 diff --git a/Examples/php4/reference/runme.php4 b/Examples/php/reference/runme.php4 similarity index 100% rename from Examples/php4/reference/runme.php4 rename to Examples/php/reference/runme.php4 diff --git a/Examples/php4/simple/Makefile b/Examples/php/simple/Makefile similarity index 100% rename from Examples/php4/simple/Makefile rename to Examples/php/simple/Makefile diff --git a/Examples/php4/simple/example.c b/Examples/php/simple/example.c similarity index 100% rename from Examples/php4/simple/example.c rename to Examples/php/simple/example.c diff --git a/Examples/php4/simple/example.i b/Examples/php/simple/example.i similarity index 100% rename from Examples/php4/simple/example.i rename to Examples/php/simple/example.i diff --git a/Examples/php4/simple/runme.php4 b/Examples/php/simple/runme.php4 similarity index 100% rename from Examples/php4/simple/runme.php4 rename to Examples/php/simple/runme.php4 diff --git a/Examples/php4/sync/Makefile b/Examples/php/sync/Makefile similarity index 100% rename from Examples/php4/sync/Makefile rename to Examples/php/sync/Makefile diff --git a/Examples/php4/sync/example.cxx b/Examples/php/sync/example.cxx similarity index 100% rename from Examples/php4/sync/example.cxx rename to Examples/php/sync/example.cxx diff --git a/Examples/php4/sync/example.h b/Examples/php/sync/example.h similarity index 100% rename from Examples/php4/sync/example.h rename to Examples/php/sync/example.h diff --git a/Examples/php4/sync/example.i b/Examples/php/sync/example.i similarity index 100% rename from Examples/php4/sync/example.i rename to Examples/php/sync/example.i diff --git a/Examples/php4/sync/runme.php4 b/Examples/php/sync/runme.php4 similarity index 100% rename from Examples/php4/sync/runme.php4 rename to Examples/php/sync/runme.php4 diff --git a/Examples/php4/value/Makefile b/Examples/php/value/Makefile similarity index 100% rename from Examples/php4/value/Makefile rename to Examples/php/value/Makefile diff --git a/Examples/php4/value/example.c b/Examples/php/value/example.c similarity index 100% rename from Examples/php4/value/example.c rename to Examples/php/value/example.c diff --git a/Examples/php4/value/example.h b/Examples/php/value/example.h similarity index 100% rename from Examples/php4/value/example.h rename to Examples/php/value/example.h diff --git a/Examples/php4/value/example.i b/Examples/php/value/example.i similarity index 100% rename from Examples/php4/value/example.i rename to Examples/php/value/example.i diff --git a/Examples/php4/value/runme.php4 b/Examples/php/value/runme.php4 similarity index 100% rename from Examples/php4/value/runme.php4 rename to Examples/php/value/runme.php4 diff --git a/Examples/php4/variables/Makefile b/Examples/php/variables/Makefile similarity index 100% rename from Examples/php4/variables/Makefile rename to Examples/php/variables/Makefile diff --git a/Examples/php4/variables/example.c b/Examples/php/variables/example.c similarity index 100% rename from Examples/php4/variables/example.c rename to Examples/php/variables/example.c diff --git a/Examples/php4/variables/example.h b/Examples/php/variables/example.h similarity index 100% rename from Examples/php4/variables/example.h rename to Examples/php/variables/example.h diff --git a/Examples/php4/variables/example.i b/Examples/php/variables/example.i similarity index 100% rename from Examples/php4/variables/example.i rename to Examples/php/variables/example.i diff --git a/Examples/php4/variables/runme.php4 b/Examples/php/variables/runme.php4 similarity index 100% rename from Examples/php4/variables/runme.php4 rename to Examples/php/variables/runme.php4 diff --git a/Examples/php4/variables/runme.php4.old b/Examples/php/variables/runme.php4.old similarity index 100% rename from Examples/php4/variables/runme.php4.old rename to Examples/php/variables/runme.php4.old diff --git a/Examples/test-suite/php4/Makefile.in b/Examples/test-suite/php/Makefile.in similarity index 100% rename from Examples/test-suite/php4/Makefile.in rename to Examples/test-suite/php/Makefile.in diff --git a/Examples/test-suite/php4/abstract_inherit_ok_runme.php4 b/Examples/test-suite/php/abstract_inherit_ok_runme.php4 similarity index 100% rename from Examples/test-suite/php4/abstract_inherit_ok_runme.php4 rename to Examples/test-suite/php/abstract_inherit_ok_runme.php4 diff --git a/Examples/test-suite/php4/abstract_inherit_runme.php4 b/Examples/test-suite/php/abstract_inherit_runme.php4 similarity index 100% rename from Examples/test-suite/php4/abstract_inherit_runme.php4 rename to Examples/test-suite/php/abstract_inherit_runme.php4 diff --git a/Examples/test-suite/php4/add_link_runme.php4 b/Examples/test-suite/php/add_link_runme.php4 similarity index 100% rename from Examples/test-suite/php4/add_link_runme.php4 rename to Examples/test-suite/php/add_link_runme.php4 diff --git a/Examples/test-suite/php4/argout_runme.php4 b/Examples/test-suite/php/argout_runme.php4 similarity index 100% rename from Examples/test-suite/php4/argout_runme.php4 rename to Examples/test-suite/php/argout_runme.php4 diff --git a/Examples/test-suite/php4/arrayptr_runme.php4 b/Examples/test-suite/php/arrayptr_runme.php4 similarity index 100% rename from Examples/test-suite/php4/arrayptr_runme.php4 rename to Examples/test-suite/php/arrayptr_runme.php4 diff --git a/Examples/test-suite/php4/arrays_global_runme.php4 b/Examples/test-suite/php/arrays_global_runme.php4 similarity index 100% rename from Examples/test-suite/php4/arrays_global_runme.php4 rename to Examples/test-suite/php/arrays_global_runme.php4 diff --git a/Examples/test-suite/php4/arrays_global_twodim_runme.php4 b/Examples/test-suite/php/arrays_global_twodim_runme.php4 similarity index 100% rename from Examples/test-suite/php4/arrays_global_twodim_runme.php4 rename to Examples/test-suite/php/arrays_global_twodim_runme.php4 diff --git a/Examples/test-suite/php4/arrays_runme.php4 b/Examples/test-suite/php/arrays_runme.php4 similarity index 100% rename from Examples/test-suite/php4/arrays_runme.php4 rename to Examples/test-suite/php/arrays_runme.php4 diff --git a/Examples/test-suite/php4/arrays_scope_runme.php4 b/Examples/test-suite/php/arrays_scope_runme.php4 similarity index 100% rename from Examples/test-suite/php4/arrays_scope_runme.php4 rename to Examples/test-suite/php/arrays_scope_runme.php4 diff --git a/Examples/test-suite/php4/casts_runme.php4 b/Examples/test-suite/php/casts_runme.php4 similarity index 100% rename from Examples/test-suite/php4/casts_runme.php4 rename to Examples/test-suite/php/casts_runme.php4 diff --git a/Examples/test-suite/php4/class_ignore_runme.php4 b/Examples/test-suite/php/class_ignore_runme.php4 similarity index 100% rename from Examples/test-suite/php4/class_ignore_runme.php4 rename to Examples/test-suite/php/class_ignore_runme.php4 diff --git a/Examples/test-suite/php4/conversion_namespace_runme.php4 b/Examples/test-suite/php/conversion_namespace_runme.php4 similarity index 100% rename from Examples/test-suite/php4/conversion_namespace_runme.php4 rename to Examples/test-suite/php/conversion_namespace_runme.php4 diff --git a/Examples/test-suite/php4/conversion_ns_template_runme.php4 b/Examples/test-suite/php/conversion_ns_template_runme.php4 similarity index 100% rename from Examples/test-suite/php4/conversion_ns_template_runme.php4 rename to Examples/test-suite/php/conversion_ns_template_runme.php4 diff --git a/Examples/test-suite/php4/conversion_runme.php4 b/Examples/test-suite/php/conversion_runme.php4 similarity index 100% rename from Examples/test-suite/php4/conversion_runme.php4 rename to Examples/test-suite/php/conversion_runme.php4 diff --git a/Examples/test-suite/php4/cpp_static_runme.php4 b/Examples/test-suite/php/cpp_static_runme.php4 similarity index 100% rename from Examples/test-suite/php4/cpp_static_runme.php4 rename to Examples/test-suite/php/cpp_static_runme.php4 diff --git a/Examples/test-suite/php4/enum_scope_template_runme.php4 b/Examples/test-suite/php/enum_scope_template_runme.php4 similarity index 100% rename from Examples/test-suite/php4/enum_scope_template_runme.php4 rename to Examples/test-suite/php/enum_scope_template_runme.php4 diff --git a/Examples/test-suite/php4/evil_diamond_ns_runme.php4 b/Examples/test-suite/php/evil_diamond_ns_runme.php4 similarity index 100% rename from Examples/test-suite/php4/evil_diamond_ns_runme.php4 rename to Examples/test-suite/php/evil_diamond_ns_runme.php4 diff --git a/Examples/test-suite/php4/evil_diamond_prop_runme.php4 b/Examples/test-suite/php/evil_diamond_prop_runme.php4 similarity index 100% rename from Examples/test-suite/php4/evil_diamond_prop_runme.php4 rename to Examples/test-suite/php/evil_diamond_prop_runme.php4 diff --git a/Examples/test-suite/php4/evil_diamond_runme.php4 b/Examples/test-suite/php/evil_diamond_runme.php4 similarity index 100% rename from Examples/test-suite/php4/evil_diamond_runme.php4 rename to Examples/test-suite/php/evil_diamond_runme.php4 diff --git a/Examples/test-suite/php4/extend_template_ns_runme.php4 b/Examples/test-suite/php/extend_template_ns_runme.php4 similarity index 100% rename from Examples/test-suite/php4/extend_template_ns_runme.php4 rename to Examples/test-suite/php/extend_template_ns_runme.php4 diff --git a/Examples/test-suite/php4/extend_template_runme.php4 b/Examples/test-suite/php/extend_template_runme.php4 similarity index 100% rename from Examples/test-suite/php4/extend_template_runme.php4 rename to Examples/test-suite/php/extend_template_runme.php4 diff --git a/Examples/test-suite/php4/grouping_runme.php4 b/Examples/test-suite/php/grouping_runme.php4 similarity index 100% rename from Examples/test-suite/php4/grouping_runme.php4 rename to Examples/test-suite/php/grouping_runme.php4 diff --git a/Examples/test-suite/php4/ignore_parameter_runme.php4 b/Examples/test-suite/php/ignore_parameter_runme.php4 similarity index 100% rename from Examples/test-suite/php4/ignore_parameter_runme.php4 rename to Examples/test-suite/php/ignore_parameter_runme.php4 diff --git a/Examples/test-suite/php4/li_carrays_runme.php4 b/Examples/test-suite/php/li_carrays_runme.php4 similarity index 100% rename from Examples/test-suite/php4/li_carrays_runme.php4 rename to Examples/test-suite/php/li_carrays_runme.php4 diff --git a/Examples/test-suite/php4/li_std_string_runme.php4 b/Examples/test-suite/php/li_std_string_runme.php4 similarity index 100% rename from Examples/test-suite/php4/li_std_string_runme.php4 rename to Examples/test-suite/php/li_std_string_runme.php4 diff --git a/Examples/test-suite/php4/namewarn_rename.i b/Examples/test-suite/php/namewarn_rename.i similarity index 100% rename from Examples/test-suite/php4/namewarn_rename.i rename to Examples/test-suite/php/namewarn_rename.i diff --git a/Examples/test-suite/php4/rename_scope_runme.php4 b/Examples/test-suite/php/rename_scope_runme.php4 similarity index 100% rename from Examples/test-suite/php4/rename_scope_runme.php4 rename to Examples/test-suite/php/rename_scope_runme.php4 diff --git a/Examples/test-suite/php4/skel.php4 b/Examples/test-suite/php/skel.php4 similarity index 100% rename from Examples/test-suite/php4/skel.php4 rename to Examples/test-suite/php/skel.php4 diff --git a/Examples/test-suite/php4/smart_pointer_rename_runme.php4 b/Examples/test-suite/php/smart_pointer_rename_runme.php4 similarity index 100% rename from Examples/test-suite/php4/smart_pointer_rename_runme.php4 rename to Examples/test-suite/php/smart_pointer_rename_runme.php4 diff --git a/Examples/test-suite/php4/sym_runme.php4 b/Examples/test-suite/php/sym_runme.php4 similarity index 100% rename from Examples/test-suite/php4/sym_runme.php4 rename to Examples/test-suite/php/sym_runme.php4 diff --git a/Examples/test-suite/php4/template_arg_typename_runme.php4 b/Examples/test-suite/php/template_arg_typename_runme.php4 similarity index 100% rename from Examples/test-suite/php4/template_arg_typename_runme.php4 rename to Examples/test-suite/php/template_arg_typename_runme.php4 diff --git a/Examples/test-suite/php4/template_construct_runme.php4 b/Examples/test-suite/php/template_construct_runme.php4 similarity index 100% rename from Examples/test-suite/php4/template_construct_runme.php4 rename to Examples/test-suite/php/template_construct_runme.php4 diff --git a/Examples/test-suite/php4/tests.php4 b/Examples/test-suite/php/tests.php4 similarity index 100% rename from Examples/test-suite/php4/tests.php4 rename to Examples/test-suite/php/tests.php4 diff --git a/Examples/test-suite/php4/typedef_reference_runme.php4 b/Examples/test-suite/php/typedef_reference_runme.php4 similarity index 100% rename from Examples/test-suite/php4/typedef_reference_runme.php4 rename to Examples/test-suite/php/typedef_reference_runme.php4 diff --git a/Examples/test-suite/php4/typemap_ns_using_runme.php4 b/Examples/test-suite/php/typemap_ns_using_runme.php4 similarity index 100% rename from Examples/test-suite/php4/typemap_ns_using_runme.php4 rename to Examples/test-suite/php/typemap_ns_using_runme.php4 diff --git a/Examples/test-suite/php4/using1_runme.php4 b/Examples/test-suite/php/using1_runme.php4 similarity index 100% rename from Examples/test-suite/php4/using1_runme.php4 rename to Examples/test-suite/php/using1_runme.php4 diff --git a/Examples/test-suite/php4/using2_runme.php4 b/Examples/test-suite/php/using2_runme.php4 similarity index 100% rename from Examples/test-suite/php4/using2_runme.php4 rename to Examples/test-suite/php/using2_runme.php4 diff --git a/Examples/test-suite/php4/valuewrapper_base_runme.php4 b/Examples/test-suite/php/valuewrapper_base_runme.php4 similarity index 100% rename from Examples/test-suite/php4/valuewrapper_base_runme.php4 rename to Examples/test-suite/php/valuewrapper_base_runme.php4