diff --git a/Classification/include/CGAL/Classification/ETHZ_random_forest_classifier.h b/Classification/include/CGAL/Classification/ETHZ_random_forest_classifier.h
index c6515f23ce0..d0aa631e320 100644
--- a/Classification/include/CGAL/Classification/ETHZ_random_forest_classifier.h
+++ b/Classification/include/CGAL/Classification/ETHZ_random_forest_classifier.h
@@ -25,8 +25,8 @@
 #include <CGAL/Classification/Feature_set.h>
 #include <CGAL/Classification/Label_set.h>
 
-#include <CGAL/Classification/random-forest/node-gini.hpp>
-#include <CGAL/Classification/random-forest/forest.hpp>
+#include <CGAL/Classification/internal/auxiliary/random-forest/node-gini.hpp>
+#include <CGAL/Classification/internal/auxiliary/random-forest/forest.hpp>
 
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
diff --git a/Classification/include/CGAL/Classification/dataview.h b/Classification/include/CGAL/Classification/internal/auxiliary/dataview.h
similarity index 100%
rename from Classification/include/CGAL/Classification/dataview.h
rename to Classification/include/CGAL/Classification/internal/auxiliary/dataview.h
diff --git a/Classification/include/CGAL/Classification/random-forest/common-libraries.hpp b/Classification/include/CGAL/Classification/internal/auxiliary/random-forest/common-libraries.hpp
similarity index 100%
rename from Classification/include/CGAL/Classification/random-forest/common-libraries.hpp
rename to Classification/include/CGAL/Classification/internal/auxiliary/random-forest/common-libraries.hpp
diff --git a/Classification/include/CGAL/Classification/random-forest/forest.hpp b/Classification/include/CGAL/Classification/internal/auxiliary/random-forest/forest.hpp
similarity index 100%
rename from Classification/include/CGAL/Classification/random-forest/forest.hpp
rename to Classification/include/CGAL/Classification/internal/auxiliary/random-forest/forest.hpp
diff --git a/Classification/include/CGAL/Classification/random-forest/node-gini.hpp b/Classification/include/CGAL/Classification/internal/auxiliary/random-forest/node-gini.hpp
similarity index 100%
rename from Classification/include/CGAL/Classification/random-forest/node-gini.hpp
rename to Classification/include/CGAL/Classification/internal/auxiliary/random-forest/node-gini.hpp
diff --git a/Classification/include/CGAL/Classification/random-forest/node.hpp b/Classification/include/CGAL/Classification/internal/auxiliary/random-forest/node.hpp
similarity index 100%
rename from Classification/include/CGAL/Classification/random-forest/node.hpp
rename to Classification/include/CGAL/Classification/internal/auxiliary/random-forest/node.hpp
diff --git a/Classification/include/CGAL/Classification/random-forest/tree.hpp b/Classification/include/CGAL/Classification/internal/auxiliary/random-forest/tree.hpp
similarity index 100%
rename from Classification/include/CGAL/Classification/random-forest/tree.hpp
rename to Classification/include/CGAL/Classification/internal/auxiliary/random-forest/tree.hpp
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp
index de35d6a54c7..20ea9bcf106 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp
@@ -88,7 +88,7 @@ Point_set_item_classification::Point_set_item_classification(Scene_points_with_n
     int current_idx = 0;
     for (std::size_t i = 0; i < used_indices.size(); ++ i)
     {
-      if (las_found && (i < 2 || i == 7 || i == 18))
+      if (las_found && (i < 2))
       {
         used_indices[i] = -1;
         continue;