diff --git a/Apollonius_graph_2/generators/README.txt b/Apollonius_graph_2/archive/generators/README.txt
similarity index 100%
rename from Apollonius_graph_2/generators/README.txt
rename to Apollonius_graph_2/archive/generators/README.txt
diff --git a/Apollonius_graph_2/generators/gen_integral_sites_in_square.cpp b/Apollonius_graph_2/archive/generators/gen_integral_sites_in_square.cpp
similarity index 100%
rename from Apollonius_graph_2/generators/gen_integral_sites_in_square.cpp
rename to Apollonius_graph_2/archive/generators/gen_integral_sites_in_square.cpp
diff --git a/Apollonius_graph_2/generators/gen_integral_sites_on_parabola.cpp b/Apollonius_graph_2/archive/generators/gen_integral_sites_on_parabola.cpp
similarity index 100%
rename from Apollonius_graph_2/generators/gen_integral_sites_on_parabola.cpp
rename to Apollonius_graph_2/archive/generators/gen_integral_sites_on_parabola.cpp
diff --git a/Apollonius_graph_2/generators/gen_sites_in_0x1_box.cpp b/Apollonius_graph_2/archive/generators/gen_sites_in_0x1_box.cpp
similarity index 100%
rename from Apollonius_graph_2/generators/gen_sites_in_0x1_box.cpp
rename to Apollonius_graph_2/archive/generators/gen_sites_in_0x1_box.cpp
diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h b/Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h
similarity index 100%
rename from Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h
rename to Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h
diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h b/Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h
similarity index 100%
rename from Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h
rename to Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h
diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h b/Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h
similarity index 100%
rename from Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h
rename to Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h
diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h b/Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h
similarity index 100%
rename from Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h
rename to Apollonius_graph_2/archive/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h
diff --git a/Apollonius_graph_2/generators/include/CGAL/bits.h b/Apollonius_graph_2/archive/generators/include/CGAL/bits.h
similarity index 100%
rename from Apollonius_graph_2/generators/include/CGAL/bits.h
rename to Apollonius_graph_2/archive/generators/include/CGAL/bits.h
diff --git a/Apollonius_graph_2/generators/include/CGAL/random_integer.h b/Apollonius_graph_2/archive/generators/include/CGAL/random_integer.h
similarity index 100%
rename from Apollonius_graph_2/generators/include/CGAL/random_integer.h
rename to Apollonius_graph_2/archive/generators/include/CGAL/random_integer.h
diff --git a/Apollonius_graph_2/generators/mk_degen.cpp b/Apollonius_graph_2/archive/generators/mk_degen.cpp
similarity index 100%
rename from Apollonius_graph_2/generators/mk_degen.cpp
rename to Apollonius_graph_2/archive/generators/mk_degen.cpp
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/New_predicates_C2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h b/Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h
similarity index 100%
rename from Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h
rename to Apollonius_graph_2/archive/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h
diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_new_traits_2.cpp b/Apollonius_graph_2/archive/test/Apollonius_graph_2/test_ag_new_traits_2.cpp
similarity index 100%
rename from Apollonius_graph_2/test/Apollonius_graph_2/test_ag_new_traits_2.cpp
rename to Apollonius_graph_2/archive/test/Apollonius_graph_2/test_ag_new_traits_2.cpp
diff --git a/Apollonius_graph_2/dont_submit b/Apollonius_graph_2/dont_submit
deleted file mode 100644
index a387ec8879c..00000000000
--- a/Apollonius_graph_2/dont_submit
+++ /dev/null
@@ -1,3 +0,0 @@
-generators
-include/CGAL/Apollonius_graph_2/Delage_traits
-test/Apollonius_graph_2/test_ag_new_traits_2.cpp