diff --git a/Extension_Packages/Moebius_diagram_2/changes.txt b/Moebius_diagram_2/changes.txt
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/changes.txt
rename to Moebius_diagram_2/changes.txt
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/makefile b/Moebius_diagram_2/demo/Moebius_diagram_2/makefile
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/makefile
rename to Moebius_diagram_2/demo/Moebius_diagram_2/makefile
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_layers.h b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_layers.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_layers.h
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_layers.h
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.C b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.C
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.C
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.C
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.h b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.h
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar.h
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.C b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.C
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.C
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.C
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.h b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.h
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_2_qt_toolbar_layers.h
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.C b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.C
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.C
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.C
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.h b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.h
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_cgal_types.h
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_qt.C b/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_qt.C
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/moebius_qt.C
rename to Moebius_diagram_2/demo/Moebius_diagram_2/moebius_qt.C
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/psstream.h b/Moebius_diagram_2/demo/Moebius_diagram_2/psstream.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/psstream.h
rename to Moebius_diagram_2/demo/Moebius_diagram_2/psstream.h
diff --git a/Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/timer.h b/Moebius_diagram_2/demo/Moebius_diagram_2/timer.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/demo/Moebius_diagram_2/timer.h
rename to Moebius_diagram_2/demo/Moebius_diagram_2/timer.h
diff --git a/Extension_Packages/Moebius_diagram_2/description.txt b/Moebius_diagram_2/description.txt
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/description.txt
rename to Moebius_diagram_2/description.txt
diff --git a/Extension_Packages/Moebius_diagram_2/examples/Moebius_diagram_2/data/moebious.cin b/Moebius_diagram_2/examples/Moebius_diagram_2/data/moebious.cin
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/examples/Moebius_diagram_2/data/moebious.cin
rename to Moebius_diagram_2/examples/Moebius_diagram_2/data/moebious.cin
diff --git a/Extension_Packages/Moebius_diagram_2/examples/Moebius_diagram_2/makefile b/Moebius_diagram_2/examples/Moebius_diagram_2/makefile
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/examples/Moebius_diagram_2/makefile
rename to Moebius_diagram_2/examples/Moebius_diagram_2/makefile
diff --git a/Extension_Packages/Moebius_diagram_2/examples/Moebius_diagram_2/moebius_main.C b/Moebius_diagram_2/examples/Moebius_diagram_2/moebius_main.C
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/examples/Moebius_diagram_2/moebius_main.C
rename to Moebius_diagram_2/examples/Moebius_diagram_2/moebius_main.C
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_circulator_3.h b/Moebius_diagram_2/include/CGAL/Moebius_circulator_3.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_circulator_3.h
rename to Moebius_diagram_2/include/CGAL/Moebius_circulator_3.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_diagram_2.h b/Moebius_diagram_2/include/CGAL/Moebius_diagram_2.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_diagram_2.h
rename to Moebius_diagram_2/include/CGAL/Moebius_diagram_2.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_diagram_euclidean_traits_2.h b/Moebius_diagram_2/include/CGAL/Moebius_diagram_euclidean_traits_2.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_diagram_euclidean_traits_2.h
rename to Moebius_diagram_2/include/CGAL/Moebius_diagram_euclidean_traits_2.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_edge_2.h b/Moebius_diagram_2/include/CGAL/Moebius_edge_2.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_edge_2.h
rename to Moebius_diagram_2/include/CGAL/Moebius_edge_2.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_iterator.h b/Moebius_diagram_2/include/CGAL/Moebius_iterator.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_iterator.h
rename to Moebius_diagram_2/include/CGAL/Moebius_iterator.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_point.h b/Moebius_diagram_2/include/CGAL/Moebius_point.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_point.h
rename to Moebius_diagram_2/include/CGAL/Moebius_point.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_regular_euclidean_traits_3.h b/Moebius_diagram_2/include/CGAL/Moebius_regular_euclidean_traits_3.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_regular_euclidean_traits_3.h
rename to Moebius_diagram_2/include/CGAL/Moebius_regular_euclidean_traits_3.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_utils.h b/Moebius_diagram_2/include/CGAL/Moebius_utils.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/Moebius_utils.h
rename to Moebius_diagram_2/include/CGAL/Moebius_utils.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/constructions/Moebius_diagram_ftC2.h b/Moebius_diagram_2/include/CGAL/constructions/Moebius_diagram_ftC2.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/constructions/Moebius_diagram_ftC2.h
rename to Moebius_diagram_2/include/CGAL/constructions/Moebius_diagram_ftC2.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_ftC2.h b/Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_ftC2.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_ftC2.h
rename to Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_ftC2.h
diff --git a/Extension_Packages/Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_regularftC2.h b/Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_regularftC2.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_regularftC2.h
rename to Moebius_diagram_2/include/CGAL/predicates/Moebius_diagram_regularftC2.h
diff --git a/Extension_Packages/Moebius_diagram_2/maintainer b/Moebius_diagram_2/maintainer
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/maintainer
rename to Moebius_diagram_2/maintainer
diff --git a/Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/Makefile b/Moebius_diagram_2/test/Moebius_diagram_2/Makefile
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/Makefile
rename to Moebius_diagram_2/test/Moebius_diagram_2/Makefile
diff --git a/Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/bench.C b/Moebius_diagram_2/test/Moebius_diagram_2/bench.C
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/bench.C
rename to Moebius_diagram_2/test/Moebius_diagram_2/bench.C
diff --git a/Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/mobius_cgal_types.h b/Moebius_diagram_2/test/Moebius_diagram_2/mobius_cgal_types.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/mobius_cgal_types.h
rename to Moebius_diagram_2/test/Moebius_diagram_2/mobius_cgal_types.h
diff --git a/Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/timer.h b/Moebius_diagram_2/test/Moebius_diagram_2/timer.h
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/test/Moebius_diagram_2/timer.h
rename to Moebius_diagram_2/test/Moebius_diagram_2/timer.h
diff --git a/Extension_Packages/Moebius_diagram_2/version b/Moebius_diagram_2/version
similarity index 100%
rename from Extension_Packages/Moebius_diagram_2/version
rename to Moebius_diagram_2/version