diff --git a/Packages/STL_Extension/changes.txt b/STL_Extension/changes.txt
similarity index 100%
rename from Packages/STL_Extension/changes.txt
rename to STL_Extension/changes.txt
diff --git a/Packages/STL_Extension/changes.txt.old b/STL_Extension/changes.txt.old
similarity index 100%
rename from Packages/STL_Extension/changes.txt.old
rename to STL_Extension/changes.txt.old
diff --git a/Packages/STL_Extension/description.txt b/STL_Extension/description.txt
similarity index 100%
rename from Packages/STL_Extension/description.txt
rename to STL_Extension/description.txt
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension/main.tex b/STL_Extension/doc_tex/STL_Extension/main.tex
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension/main.tex
rename to STL_Extension/doc_tex/STL_Extension/main.tex
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/compact_container.tex b/STL_Extension/doc_tex/STL_Extension_ref/compact_container.tex
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/compact_container.tex
rename to STL_Extension/doc_tex/STL_Extension_ref/compact_container.tex
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/in_list_prog.C b/STL_Extension/doc_tex/STL_Extension_ref/in_list_prog.C
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/in_list_prog.C
rename to STL_Extension/doc_tex/STL_Extension_ref/in_list_prog.C
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/in_place_list.tex b/STL_Extension/doc_tex/STL_Extension_ref/in_place_list.tex
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/in_place_list.tex
rename to STL_Extension/doc_tex/STL_Extension_ref/in_place_list.tex
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/in_place_list_prog.C b/STL_Extension/doc_tex/STL_Extension_ref/in_place_list_prog.C
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/in_place_list_prog.C
rename to STL_Extension/doc_tex/STL_Extension_ref/in_place_list_prog.C
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/intro.tex b/STL_Extension/doc_tex/STL_Extension_ref/intro.tex
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/intro.tex
rename to STL_Extension/doc_tex/STL_Extension_ref/intro.tex
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/main.tex b/STL_Extension/doc_tex/STL_Extension_ref/main.tex
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/main.tex
rename to STL_Extension/doc_tex/STL_Extension_ref/main.tex
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/min_element_if_example_noheader.C b/STL_Extension/doc_tex/STL_Extension_ref/min_element_if_example_noheader.C
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/min_element_if_example_noheader.C
rename to STL_Extension/doc_tex/STL_Extension_ref/min_element_if_example_noheader.C
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/min_max_element_example_noheader.C b/STL_Extension/doc_tex/STL_Extension_ref/min_max_element_example_noheader.C
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/min_max_element_example_noheader.C
rename to STL_Extension/doc_tex/STL_Extension_ref/min_max_element_example_noheader.C
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/multiset.tex b/STL_Extension/doc_tex/STL_Extension_ref/multiset.tex
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/multiset.tex
rename to STL_Extension/doc_tex/STL_Extension_ref/multiset.tex
diff --git a/Packages/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex b/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex
similarity index 100%
rename from Packages/STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex
rename to STL_Extension/doc_tex/STL_Extension_ref/stl_extension.tex
diff --git a/Packages/STL_Extension/dont_submit b/STL_Extension/dont_submit
similarity index 100%
rename from Packages/STL_Extension/dont_submit
rename to STL_Extension/dont_submit
diff --git a/Packages/STL_Extension/examples/STL_Extension/cgal_test b/STL_Extension/examples/STL_Extension/cgal_test
similarity index 100%
rename from Packages/STL_Extension/examples/STL_Extension/cgal_test
rename to STL_Extension/examples/STL_Extension/cgal_test
diff --git a/Packages/STL_Extension/examples/STL_Extension/in_place_list_prog.C b/STL_Extension/examples/STL_Extension/in_place_list_prog.C
similarity index 100%
rename from Packages/STL_Extension/examples/STL_Extension/in_place_list_prog.C
rename to STL_Extension/examples/STL_Extension/in_place_list_prog.C
diff --git a/Packages/STL_Extension/examples/STL_Extension/makefile b/STL_Extension/examples/STL_Extension/makefile
similarity index 100%
rename from Packages/STL_Extension/examples/STL_Extension/makefile
rename to STL_Extension/examples/STL_Extension/makefile
diff --git a/Packages/STL_Extension/examples/STL_Extension/min_element_if_example_noheader.C b/STL_Extension/examples/STL_Extension/min_element_if_example_noheader.C
similarity index 100%
rename from Packages/STL_Extension/examples/STL_Extension/min_element_if_example_noheader.C
rename to STL_Extension/examples/STL_Extension/min_element_if_example_noheader.C
diff --git a/Packages/STL_Extension/examples/STL_Extension/min_max_element_example_noheader.C b/STL_Extension/examples/STL_Extension/min_max_element_example_noheader.C
similarity index 100%
rename from Packages/STL_Extension/examples/STL_Extension/min_max_element_example_noheader.C
rename to STL_Extension/examples/STL_Extension/min_max_element_example_noheader.C
diff --git a/Packages/STL_Extension/include/CGAL/Circulator_identity.h b/STL_Extension/include/CGAL/Circulator_identity.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Circulator_identity.h
rename to STL_Extension/include/CGAL/Circulator_identity.h
diff --git a/Packages/STL_Extension/include/CGAL/Circulator_on_node.h b/STL_Extension/include/CGAL/Circulator_on_node.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Circulator_on_node.h
rename to STL_Extension/include/CGAL/Circulator_on_node.h
diff --git a/Packages/STL_Extension/include/CGAL/Circulator_project.h b/STL_Extension/include/CGAL/Circulator_project.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Circulator_project.h
rename to STL_Extension/include/CGAL/Circulator_project.h
diff --git a/Packages/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Compact_container.h
rename to STL_Extension/include/CGAL/Compact_container.h
diff --git a/Packages/STL_Extension/include/CGAL/Concatenate_iterator.h b/STL_Extension/include/CGAL/Concatenate_iterator.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Concatenate_iterator.h
rename to STL_Extension/include/CGAL/Concatenate_iterator.h
diff --git a/Packages/STL_Extension/include/CGAL/Counting_iterator.h b/STL_Extension/include/CGAL/Counting_iterator.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Counting_iterator.h
rename to STL_Extension/include/CGAL/Counting_iterator.h
diff --git a/Packages/STL_Extension/include/CGAL/Fourtuple.h b/STL_Extension/include/CGAL/Fourtuple.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Fourtuple.h
rename to STL_Extension/include/CGAL/Fourtuple.h
diff --git a/Packages/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/In_place_list.h
rename to STL_Extension/include/CGAL/In_place_list.h
diff --git a/Packages/STL_Extension/include/CGAL/Inverse_index.h b/STL_Extension/include/CGAL/Inverse_index.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Inverse_index.h
rename to STL_Extension/include/CGAL/Inverse_index.h
diff --git a/Packages/STL_Extension/include/CGAL/Iterator_identity.h b/STL_Extension/include/CGAL/Iterator_identity.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Iterator_identity.h
rename to STL_Extension/include/CGAL/Iterator_identity.h
diff --git a/Packages/STL_Extension/include/CGAL/Iterator_project.h b/STL_Extension/include/CGAL/Iterator_project.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Iterator_project.h
rename to STL_Extension/include/CGAL/Iterator_project.h
diff --git a/Packages/STL_Extension/include/CGAL/Join_input_iterator.h b/STL_Extension/include/CGAL/Join_input_iterator.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Join_input_iterator.h
rename to STL_Extension/include/CGAL/Join_input_iterator.h
diff --git a/Packages/STL_Extension/include/CGAL/Multiset.h b/STL_Extension/include/CGAL/Multiset.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Multiset.h
rename to STL_Extension/include/CGAL/Multiset.h
diff --git a/Packages/STL_Extension/include/CGAL/N_step_adaptor.h b/STL_Extension/include/CGAL/N_step_adaptor.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/N_step_adaptor.h
rename to STL_Extension/include/CGAL/N_step_adaptor.h
diff --git a/Packages/STL_Extension/include/CGAL/N_step_adaptor_derived.h b/STL_Extension/include/CGAL/N_step_adaptor_derived.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/N_step_adaptor_derived.h
rename to STL_Extension/include/CGAL/N_step_adaptor_derived.h
diff --git a/Packages/STL_Extension/include/CGAL/Nested_iterator.h b/STL_Extension/include/CGAL/Nested_iterator.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Nested_iterator.h
rename to STL_Extension/include/CGAL/Nested_iterator.h
diff --git a/Packages/STL_Extension/include/CGAL/Random_access_adaptor.h b/STL_Extension/include/CGAL/Random_access_adaptor.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Random_access_adaptor.h
rename to STL_Extension/include/CGAL/Random_access_adaptor.h
diff --git a/Packages/STL_Extension/include/CGAL/Random_access_value_adaptor.h b/STL_Extension/include/CGAL/Random_access_value_adaptor.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Random_access_value_adaptor.h
rename to STL_Extension/include/CGAL/Random_access_value_adaptor.h
diff --git a/Packages/STL_Extension/include/CGAL/Sixtuple.h b/STL_Extension/include/CGAL/Sixtuple.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Sixtuple.h
rename to STL_Extension/include/CGAL/Sixtuple.h
diff --git a/Packages/STL_Extension/include/CGAL/Threetuple.h b/STL_Extension/include/CGAL/Threetuple.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Threetuple.h
rename to STL_Extension/include/CGAL/Threetuple.h
diff --git a/Packages/STL_Extension/include/CGAL/Twotuple.h b/STL_Extension/include/CGAL/Twotuple.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/Twotuple.h
rename to STL_Extension/include/CGAL/Twotuple.h
diff --git a/Packages/STL_Extension/include/CGAL/algorithm.h b/STL_Extension/include/CGAL/algorithm.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/algorithm.h
rename to STL_Extension/include/CGAL/algorithm.h
diff --git a/Packages/STL_Extension/include/CGAL/assertions.h b/STL_Extension/include/CGAL/assertions.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/assertions.h
rename to STL_Extension/include/CGAL/assertions.h
diff --git a/Packages/STL_Extension/include/CGAL/copy_n.h b/STL_Extension/include/CGAL/copy_n.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/copy_n.h
rename to STL_Extension/include/CGAL/copy_n.h
diff --git a/Packages/STL_Extension/include/CGAL/function_objects.h b/STL_Extension/include/CGAL/function_objects.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/function_objects.h
rename to STL_Extension/include/CGAL/function_objects.h
diff --git a/Packages/STL_Extension/include/CGAL/functional.h b/STL_Extension/include/CGAL/functional.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/functional.h
rename to STL_Extension/include/CGAL/functional.h
diff --git a/Packages/STL_Extension/include/CGAL/functional_base.h b/STL_Extension/include/CGAL/functional_base.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/functional_base.h
rename to STL_Extension/include/CGAL/functional_base.h
diff --git a/Packages/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/iterator.h
rename to STL_Extension/include/CGAL/iterator.h
diff --git a/Packages/STL_Extension/include/CGAL/memory.h b/STL_Extension/include/CGAL/memory.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/memory.h
rename to STL_Extension/include/CGAL/memory.h
diff --git a/Packages/STL_Extension/include/CGAL/multiset_assertions.h b/STL_Extension/include/CGAL/multiset_assertions.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/multiset_assertions.h
rename to STL_Extension/include/CGAL/multiset_assertions.h
diff --git a/Packages/STL_Extension/include/CGAL/tags.h b/STL_Extension/include/CGAL/tags.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/tags.h
rename to STL_Extension/include/CGAL/tags.h
diff --git a/Packages/STL_Extension/include/CGAL/utility.h b/STL_Extension/include/CGAL/utility.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/utility.h
rename to STL_Extension/include/CGAL/utility.h
diff --git a/Packages/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h
similarity index 100%
rename from Packages/STL_Extension/include/CGAL/vector.h
rename to STL_Extension/include/CGAL/vector.h
diff --git a/Packages/STL_Extension/maintainer b/STL_Extension/maintainer
similarity index 100%
rename from Packages/STL_Extension/maintainer
rename to STL_Extension/maintainer
diff --git a/Packages/STL_Extension/src/assertions.C b/STL_Extension/src/assertions.C
similarity index 100%
rename from Packages/STL_Extension/src/assertions.C
rename to STL_Extension/src/assertions.C
diff --git a/Packages/STL_Extension/test/STL_Extension/cgal_test b/STL_Extension/test/STL_Extension/cgal_test
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/cgal_test
rename to STL_Extension/test/STL_Extension/cgal_test
diff --git a/Packages/STL_Extension/test/STL_Extension/makefile b/STL_Extension/test/STL_Extension/makefile
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/makefile
rename to STL_Extension/test/STL_Extension/makefile
diff --git a/Packages/STL_Extension/test/STL_Extension/test_Compact_container.C b/STL_Extension/test/STL_Extension/test_Compact_container.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_Compact_container.C
rename to STL_Extension/test/STL_Extension/test_Compact_container.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_Concatenate_iterator.C b/STL_Extension/test/STL_Extension/test_Concatenate_iterator.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_Concatenate_iterator.C
rename to STL_Extension/test/STL_Extension/test_Concatenate_iterator.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_In_place_list.C b/STL_Extension/test/STL_Extension/test_In_place_list.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_In_place_list.C
rename to STL_Extension/test/STL_Extension/test_In_place_list.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_Nested_iterator.C b/STL_Extension/test/STL_Extension/test_Nested_iterator.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_Nested_iterator.C
rename to STL_Extension/test/STL_Extension/test_Nested_iterator.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_composition.C b/STL_Extension/test/STL_Extension/test_composition.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_composition.C
rename to STL_Extension/test/STL_Extension/test_composition.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_multiset.C b/STL_Extension/test/STL_Extension/test_multiset.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_multiset.C
rename to STL_Extension/test/STL_Extension/test_multiset.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_new_binders1.C b/STL_Extension/test/STL_Extension/test_new_binders1.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_new_binders1.C
rename to STL_Extension/test/STL_Extension/test_new_binders1.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_stl_extension.C b/STL_Extension/test/STL_Extension/test_stl_extension.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_stl_extension.C
rename to STL_Extension/test/STL_Extension/test_stl_extension.C
diff --git a/Packages/STL_Extension/test/STL_Extension/test_vector.C b/STL_Extension/test/STL_Extension/test_vector.C
similarity index 100%
rename from Packages/STL_Extension/test/STL_Extension/test_vector.C
rename to STL_Extension/test/STL_Extension/test_vector.C