#include <grid/tria_boundary_lib.h>
#include <grid/tria.h>
#include <grid/grid_out.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q.h>
#include <grid/grid_generator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <fe/fe_q.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <numerics/vectors.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <base/smartpointer.h>
#include <numerics/vectors.h>
#include <base/convergence_table.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <typeinfo>
#include <fstream>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <dofs/dof_accessor.h>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <dofs/dof_accessor.h>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <multigrid/mg_dof_accessor.h>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <fstream>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <fstream>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <fstream>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <multigrid/mg_dof_handler.h>
#include <fstream>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <numerics/vectors.h>
#include <grid/grid_generator.h>
#include <grid/grid_tools.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <numerics/vectors.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/grid_refinement.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/fe_tools.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <dofs/dof_constraints.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/q_collection.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_raviart_thomas.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_raviart_thomas.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_dgq.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_dgq.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_dgq.h>
#include <grid/tria.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <fe/fe_dgq.h>
#include <numerics/derivative_approximation.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <fe/fe_dgq.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <fe/fe_dgq.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <fe/fe_dgq.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <fstream>
#include "../tests.h"
#include <grid/tria.h>
#include <dofs/dof_handler.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/grid_out.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_collection.h>
#include <fe/q_collection.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <grid/tria_accessor.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <grid/tria_accessor.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/grid_refinement.h>
#include <grid/tria_accessor.h>
#include <lac/vector.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <grid/grid_generator.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <fe/fe_dgq.h>
#include <grid/tria_accessor.h>
#include <grid/grid_out.h>
#include <grid/tria_iterator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <grid/tria_boundary_lib.h>
#include <grid/tria.h>
#include <grid/grid_out.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <fe/mapping_q.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <grid/grid_refinement.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <dofs/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/grid_generator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <fe/fe_q.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <dofs/dof_accessor.h>
#include <fe/fe_q.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <base/quadrature_lib.h>
#include <base/function.h>
#include <numerics/vectors.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <fe/fe_q.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <lac/solver_cg.h>
#include <lac/precondition.h>
#include <grid/tria.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <grid/grid_generator.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_constraints.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <base/smartpointer.h>
#include <numerics/vectors.h>
#include <base/convergence_table.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <typeinfo>
#include <fstream>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_accessor.h>
#include <grid/tria_iterator.h>
#include <grid/tria_boundary_lib.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_accessor.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
-#include <fe/hp_fe_values.h>
+#include <hp/fe_values.h>
#include <numerics/vectors.h>
#include <numerics/matrices.h>
#include <numerics/data_out.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_raviart_thomas.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_raviart_thomas.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>
#include <grid/tria_iterator.h>
#include <grid/tria_accessor.h>
#include <grid/grid_generator.h>
-#include <dofs/hp_dof_handler.h>
+#include <hp/dof_handler.h>
#include <dofs/dof_tools.h>
#include <dofs/dof_constraints.h>
#include <fe/fe_q.h>