diff --git a/.gitmodules b/.gitmodules
index b371272de..3e89e65e4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,15 @@
 [submodule "extra_packages/extra-materials"]
 	path = extra_packages/extra-materials
 	url = git@lsmssrv1.epfl.ch:akantu-extra-materials.git
 [submodule "extra_packages/igfem"]
 	path = extra_packages/igfem
 	url = git@lsmssrv1.epfl.ch:akantu-igfem.git
 [submodule "extra_packages/parallel-cohesive-element"]
 	path = extra_packages/parallel-cohesive-element
 	url = git@lsmssrv1.epfl.ch:akantu-parallel-cohesive.git
-[submodule "extra_packages/traction-at-split-node-contact"]
-	path = extra_packages/traction-at-split-node-contact
-	url = git@lsmssrv1.epfl.ch:akantu-traction-at-split-node-contact.git
 [submodule "extra_packages/students-extra-package"]
 	path = extra_packages/students-extra-package
 	url = git@lsmssrv1.epfl.ch:students-extra-package.git
 [submodule "extra_packages/phase-field"]
 	path = extra_packages/phase-field
 	url = git@lsmssrv1.epfl.ch:akantu-phase-field.git
diff --git a/cmake/akantu_test_environement.sh.in b/cmake/akantu_environement.sh.in
similarity index 100%
rename from cmake/akantu_test_environement.sh.in
rename to cmake/akantu_environement.sh.in
diff --git a/examples/contact/CMakeLists.txt b/extra_packages/contact_alejandro/examples/contact/CMakeLists.txt
similarity index 100%
rename from examples/contact/CMakeLists.txt
rename to extra_packages/contact_alejandro/examples/contact/CMakeLists.txt
diff --git a/examples/contact/blocks.cc b/extra_packages/contact_alejandro/examples/contact/blocks.cc
similarity index 100%
rename from examples/contact/blocks.cc
rename to extra_packages/contact_alejandro/examples/contact/blocks.cc
diff --git a/examples/contact/blocks.geo b/extra_packages/contact_alejandro/examples/contact/blocks.geo
similarity index 100%
rename from examples/contact/blocks.geo
rename to extra_packages/contact_alejandro/examples/contact/blocks.geo
diff --git a/examples/contact/hertz_2D.cc b/extra_packages/contact_alejandro/examples/contact/hertz_2D.cc
similarity index 100%
rename from examples/contact/hertz_2D.cc
rename to extra_packages/contact_alejandro/examples/contact/hertz_2D.cc
diff --git a/examples/contact/hertz_2D.geo b/extra_packages/contact_alejandro/examples/contact/hertz_2D.geo
similarity index 100%
rename from examples/contact/hertz_2D.geo
rename to extra_packages/contact_alejandro/examples/contact/hertz_2D.geo
diff --git a/examples/contact/hertz_3D.cc b/extra_packages/contact_alejandro/examples/contact/hertz_3D.cc
similarity index 100%
rename from examples/contact/hertz_3D.cc
rename to extra_packages/contact_alejandro/examples/contact/hertz_3D.cc
diff --git a/examples/contact/hertz_3D.geo b/extra_packages/contact_alejandro/examples/contact/hertz_3D.geo
similarity index 100%
rename from examples/contact/hertz_3D.geo
rename to extra_packages/contact_alejandro/examples/contact/hertz_3D.geo
diff --git a/examples/contact/steel.dat b/extra_packages/contact_alejandro/examples/contact/steel.dat
similarity index 100%
rename from examples/contact/steel.dat
rename to extra_packages/contact_alejandro/examples/contact/steel.dat
diff --git a/examples/contact/tetrahedra.cc b/extra_packages/contact_alejandro/examples/contact/tetrahedra.cc
similarity index 100%
rename from examples/contact/tetrahedra.cc
rename to extra_packages/contact_alejandro/examples/contact/tetrahedra.cc
diff --git a/examples/contact/tetrahedra.geo b/extra_packages/contact_alejandro/examples/contact/tetrahedra.geo
similarity index 100%
rename from examples/contact/tetrahedra.geo
rename to extra_packages/contact_alejandro/examples/contact/tetrahedra.geo
diff --git a/examples/optimization/CMakeLists.txt b/extra_packages/contact_alejandro/examples/optimization/CMakeLists.txt
similarity index 100%
rename from examples/optimization/CMakeLists.txt
rename to extra_packages/contact_alejandro/examples/optimization/CMakeLists.txt
diff --git a/examples/optimization/fn_optimize.cc b/extra_packages/contact_alejandro/examples/optimization/fn_optimize.cc
similarity index 100%
rename from examples/optimization/fn_optimize.cc
rename to extra_packages/contact_alejandro/examples/optimization/fn_optimize.cc
diff --git a/doc/manual/figures/hertz_3D.png b/extra_packages/contact_alejandro/manual/hertz_3D.png
similarity index 100%
rename from doc/manual/figures/hertz_3D.png
rename to extra_packages/contact_alejandro/manual/hertz_3D.png
diff --git a/doc/manual/manual-contact.tex b/extra_packages/contact_alejandro/manual/manual-contact.tex
similarity index 100%
rename from doc/manual/manual-contact.tex
rename to extra_packages/contact_alejandro/manual/manual-contact.tex
diff --git a/extra_packages/contact_alejandro/package.cmake b/extra_packages/contact_alejandro/package.cmake
new file mode 100644
index 000000000..b1e1d4e10
--- /dev/null
+++ b/extra_packages/contact_alejandro/package.cmake
@@ -0,0 +1,9 @@
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/packages")
+
+include(contact)
+include(cpparray)
+include(nlopt)
+include(optimization)
+
+#add_example(contact              "Examples on how to use contact within Akantu"        PACKAGE contact)
+#add_example(optimization         "Optimization examples"                               PACKAGE optimization)
diff --git a/packages/contact.cmake b/extra_packages/contact_alejandro/packages/contact.cmake
similarity index 86%
rename from packages/contact.cmake
rename to extra_packages/contact_alejandro/packages/contact.cmake
index f3ee02883..5f584dc51 100644
--- a/packages/contact.cmake
+++ b/extra_packages/contact_alejandro/packages/contact.cmake
@@ -1,85 +1,98 @@
 #===============================================================================
 # @file   contact.cmake
 #
 # @author Alejandro M. Aragón <alejandro.aragon@epfl.ch>
 # @author Nicolas Richart <nicolas.richart@epfl.ch>
 #
 # @date creation: Mon Nov 21 2011
 # @date last modification: Mon Jan 18 2016
 #
 # @brief  package description for contact
 #
 # @section LICENSE
 #
 # Copyright (©)  2010-2012, 2014,  2015 EPFL  (Ecole Polytechnique  Fédérale de
 # Lausanne)  Laboratory (LSMS  -  Laboratoire de  Simulation  en Mécanique  des
 # Solides)
 #
 # Akantu is free  software: you can redistribute it and/or  modify it under the
 # terms  of the  GNU Lesser  General Public  License as  published by  the Free
 # Software Foundation, either version 3 of the License, or (at your option) any
 # later version.
 #
 # Akantu is  distributed in the  hope that it  will be useful, but  WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A  PARTICULAR PURPOSE. See  the GNU  Lesser General  Public License  for more
 # details.
 #
 # You should  have received  a copy  of the GNU  Lesser General  Public License
 # along with Akantu. If not, see <http://www.gnu.org/licenses/>.
 #
 #===============================================================================
 
 package_declare(contact
   DESCRIPTION "Use Contact package of Akantu"
-  DEPENDS cpparray implicit optimization)
+  DEPENDS cpparray implicit optimization core_cxx11)
 
 
 package_declare_sources(contact
+  common/aka_point.hh
+  common/aka_ball.cc
+  common/aka_plane.hh
+  common/aka_polytope.hh
+  common/aka_ball.hh
+  common/aka_timer.hh
+  common/aka_tree.hh
+  common/aka_bounding_box.hh
+  common/aka_bounding_box.cc
+  common/aka_geometry.hh
+  common/aka_geometry.cc
+  model/solid_mechanics/solid_mechanics_model_element.hh
+
   #cc files
   contact/discretization.cc
   contact/element.cc
   contact/friction.cc
   contact/resolution/resolution_augmented_lagrangian.cc
   contact/scheme.cc
   contact/search.cc
   contact/surface.cc
   contact/zone.cc
   contact/contact_impl.cc
 
   # include files
   contact/contact_common.hh
   contact/contact_manager.hh
   contact/discretization.hh
   contact/element.hh
   contact/friction.hh
   contact/resolution.hh
   contact/resolution/resolution_augmented_lagrangian.hh
   contact/scheme.hh
   contact/search.hh
   contact/surface.hh
   contact/zone.hh
   contact/contact_impl.hh
   )
 
 
 if(AKANTU_CONTACT)
   list(APPEND AKANTU_BOOST_COMPONENTS
     chrono
     system
     )
 endif()
 
 package_declare_documentation_files(contact
   manual-contact.tex
   figures/hertz_3D.png
   )
 
 package_declare_documentation(contact
   "This package enables the contact mechanics engine for Akantu"
   )
 
 package_set_package_system_dependency(contact deb-src
   libboost-system-dev libboost-chrono-dev)
 package_set_package_system_dependency(contact deb
   libboost-system1.58 libboost-chrono1.58)
diff --git a/packages/cpparray.cmake b/extra_packages/contact_alejandro/packages/cpparray.cmake
similarity index 100%
rename from packages/cpparray.cmake
rename to extra_packages/contact_alejandro/packages/cpparray.cmake
diff --git a/packages/nlopt.cmake b/extra_packages/contact_alejandro/packages/nlopt.cmake
similarity index 100%
rename from packages/nlopt.cmake
rename to extra_packages/contact_alejandro/packages/nlopt.cmake
diff --git a/packages/optimization.cmake b/extra_packages/contact_alejandro/packages/optimization.cmake
similarity index 100%
rename from packages/optimization.cmake
rename to extra_packages/contact_alejandro/packages/optimization.cmake
diff --git a/src/common/aka_ball.cc b/extra_packages/contact_alejandro/src/common/aka_ball.cc
similarity index 100%
rename from src/common/aka_ball.cc
rename to extra_packages/contact_alejandro/src/common/aka_ball.cc
diff --git a/src/common/aka_ball.hh b/extra_packages/contact_alejandro/src/common/aka_ball.hh
similarity index 100%
rename from src/common/aka_ball.hh
rename to extra_packages/contact_alejandro/src/common/aka_ball.hh
diff --git a/src/common/aka_bounding_box.cc b/extra_packages/contact_alejandro/src/common/aka_bounding_box.cc
similarity index 100%
rename from src/common/aka_bounding_box.cc
rename to extra_packages/contact_alejandro/src/common/aka_bounding_box.cc
diff --git a/src/common/aka_bounding_box.hh b/extra_packages/contact_alejandro/src/common/aka_bounding_box.hh
similarity index 100%
rename from src/common/aka_bounding_box.hh
rename to extra_packages/contact_alejandro/src/common/aka_bounding_box.hh
diff --git a/src/common/aka_geometry.cc b/extra_packages/contact_alejandro/src/common/aka_geometry.cc
similarity index 100%
rename from src/common/aka_geometry.cc
rename to extra_packages/contact_alejandro/src/common/aka_geometry.cc
diff --git a/src/common/aka_geometry.hh b/extra_packages/contact_alejandro/src/common/aka_geometry.hh
similarity index 100%
rename from src/common/aka_geometry.hh
rename to extra_packages/contact_alejandro/src/common/aka_geometry.hh
diff --git a/src/common/aka_optimize.cc b/extra_packages/contact_alejandro/src/common/aka_optimize.cc
similarity index 100%
rename from src/common/aka_optimize.cc
rename to extra_packages/contact_alejandro/src/common/aka_optimize.cc
diff --git a/src/common/aka_optimize.hh b/extra_packages/contact_alejandro/src/common/aka_optimize.hh
similarity index 100%
rename from src/common/aka_optimize.hh
rename to extra_packages/contact_alejandro/src/common/aka_optimize.hh
diff --git a/src/common/aka_plane.hh b/extra_packages/contact_alejandro/src/common/aka_plane.hh
similarity index 100%
rename from src/common/aka_plane.hh
rename to extra_packages/contact_alejandro/src/common/aka_plane.hh
diff --git a/src/common/aka_point.hh b/extra_packages/contact_alejandro/src/common/aka_point.hh
similarity index 100%
rename from src/common/aka_point.hh
rename to extra_packages/contact_alejandro/src/common/aka_point.hh
diff --git a/src/common/aka_polytope.hh b/extra_packages/contact_alejandro/src/common/aka_polytope.hh
similarity index 100%
rename from src/common/aka_polytope.hh
rename to extra_packages/contact_alejandro/src/common/aka_polytope.hh
diff --git a/src/common/aka_timer.hh b/extra_packages/contact_alejandro/src/common/aka_timer.hh
similarity index 100%
rename from src/common/aka_timer.hh
rename to extra_packages/contact_alejandro/src/common/aka_timer.hh
diff --git a/src/common/aka_tree.hh b/extra_packages/contact_alejandro/src/common/aka_tree.hh
similarity index 100%
rename from src/common/aka_tree.hh
rename to extra_packages/contact_alejandro/src/common/aka_tree.hh
diff --git a/src/contact/contact_common.hh b/extra_packages/contact_alejandro/src/contact/contact_common.hh
similarity index 100%
rename from src/contact/contact_common.hh
rename to extra_packages/contact_alejandro/src/contact/contact_common.hh
diff --git a/src/contact/contact_impl.cc b/extra_packages/contact_alejandro/src/contact/contact_impl.cc
similarity index 100%
rename from src/contact/contact_impl.cc
rename to extra_packages/contact_alejandro/src/contact/contact_impl.cc
diff --git a/src/contact/contact_impl.hh b/extra_packages/contact_alejandro/src/contact/contact_impl.hh
similarity index 100%
rename from src/contact/contact_impl.hh
rename to extra_packages/contact_alejandro/src/contact/contact_impl.hh
diff --git a/src/contact/contact_manager.hh b/extra_packages/contact_alejandro/src/contact/contact_manager.hh
similarity index 100%
rename from src/contact/contact_manager.hh
rename to extra_packages/contact_alejandro/src/contact/contact_manager.hh
diff --git a/src/contact/discretization.cc b/extra_packages/contact_alejandro/src/contact/discretization.cc
similarity index 100%
rename from src/contact/discretization.cc
rename to extra_packages/contact_alejandro/src/contact/discretization.cc
diff --git a/src/contact/discretization.hh b/extra_packages/contact_alejandro/src/contact/discretization.hh
similarity index 100%
rename from src/contact/discretization.hh
rename to extra_packages/contact_alejandro/src/contact/discretization.hh
diff --git a/src/contact/element.cc b/extra_packages/contact_alejandro/src/contact/element.cc
similarity index 100%
rename from src/contact/element.cc
rename to extra_packages/contact_alejandro/src/contact/element.cc
diff --git a/src/contact/element.hh b/extra_packages/contact_alejandro/src/contact/element.hh
similarity index 100%
rename from src/contact/element.hh
rename to extra_packages/contact_alejandro/src/contact/element.hh
diff --git a/src/contact/friction.cc b/extra_packages/contact_alejandro/src/contact/friction.cc
similarity index 100%
rename from src/contact/friction.cc
rename to extra_packages/contact_alejandro/src/contact/friction.cc
diff --git a/src/contact/friction.hh b/extra_packages/contact_alejandro/src/contact/friction.hh
similarity index 100%
rename from src/contact/friction.hh
rename to extra_packages/contact_alejandro/src/contact/friction.hh
diff --git a/src/contact/resolution.hh b/extra_packages/contact_alejandro/src/contact/resolution.hh
similarity index 100%
rename from src/contact/resolution.hh
rename to extra_packages/contact_alejandro/src/contact/resolution.hh
diff --git a/src/contact/resolution/resolution_augmented_lagrangian.cc b/extra_packages/contact_alejandro/src/contact/resolution/resolution_augmented_lagrangian.cc
similarity index 100%
rename from src/contact/resolution/resolution_augmented_lagrangian.cc
rename to extra_packages/contact_alejandro/src/contact/resolution/resolution_augmented_lagrangian.cc
diff --git a/src/contact/resolution/resolution_augmented_lagrangian.hh b/extra_packages/contact_alejandro/src/contact/resolution/resolution_augmented_lagrangian.hh
similarity index 100%
rename from src/contact/resolution/resolution_augmented_lagrangian.hh
rename to extra_packages/contact_alejandro/src/contact/resolution/resolution_augmented_lagrangian.hh
diff --git a/src/contact/scheme.cc b/extra_packages/contact_alejandro/src/contact/scheme.cc
similarity index 100%
rename from src/contact/scheme.cc
rename to extra_packages/contact_alejandro/src/contact/scheme.cc
diff --git a/src/contact/scheme.hh b/extra_packages/contact_alejandro/src/contact/scheme.hh
similarity index 100%
rename from src/contact/scheme.hh
rename to extra_packages/contact_alejandro/src/contact/scheme.hh
diff --git a/src/contact/search.cc b/extra_packages/contact_alejandro/src/contact/search.cc
similarity index 100%
rename from src/contact/search.cc
rename to extra_packages/contact_alejandro/src/contact/search.cc
diff --git a/src/contact/search.hh b/extra_packages/contact_alejandro/src/contact/search.hh
similarity index 100%
rename from src/contact/search.hh
rename to extra_packages/contact_alejandro/src/contact/search.hh
diff --git a/src/contact/surface.cc b/extra_packages/contact_alejandro/src/contact/surface.cc
similarity index 100%
rename from src/contact/surface.cc
rename to extra_packages/contact_alejandro/src/contact/surface.cc
diff --git a/src/contact/surface.hh b/extra_packages/contact_alejandro/src/contact/surface.hh
similarity index 100%
rename from src/contact/surface.hh
rename to extra_packages/contact_alejandro/src/contact/surface.hh
diff --git a/src/contact/zone.cc b/extra_packages/contact_alejandro/src/contact/zone.cc
similarity index 100%
rename from src/contact/zone.cc
rename to extra_packages/contact_alejandro/src/contact/zone.cc
diff --git a/src/contact/zone.hh b/extra_packages/contact_alejandro/src/contact/zone.hh
similarity index 100%
rename from src/contact/zone.hh
rename to extra_packages/contact_alejandro/src/contact/zone.hh
diff --git a/src/model/solid_mechanics/solid_mechanics_model_element.hh b/extra_packages/contact_alejandro/src/model/solid_mechanics/solid_mechanics_model_element.hh
similarity index 100%
rename from src/model/solid_mechanics/solid_mechanics_model_element.hh
rename to extra_packages/contact_alejandro/src/model/solid_mechanics/solid_mechanics_model_element.hh
diff --git a/test/test_contact/CMakeLists.txt b/extra_packages/contact_alejandro/test/CMakeLists.txt
similarity index 100%
rename from test/test_contact/CMakeLists.txt
rename to extra_packages/contact_alejandro/test/CMakeLists.txt
diff --git a/test/test_contact/acurnier_2D_1.cc b/extra_packages/contact_alejandro/test/acurnier_2D_1.cc
similarity index 100%
rename from test/test_contact/acurnier_2D_1.cc
rename to extra_packages/contact_alejandro/test/acurnier_2D_1.cc
diff --git a/test/test_contact/acurnier_2D_1.geo b/extra_packages/contact_alejandro/test/acurnier_2D_1.geo
similarity index 100%
rename from test/test_contact/acurnier_2D_1.geo
rename to extra_packages/contact_alejandro/test/acurnier_2D_1.geo
diff --git a/test/test_contact/acurnier_2D_2.cc b/extra_packages/contact_alejandro/test/acurnier_2D_2.cc
similarity index 100%
rename from test/test_contact/acurnier_2D_2.cc
rename to extra_packages/contact_alejandro/test/acurnier_2D_2.cc
diff --git a/test/test_contact/acurnier_2D_2.geo b/extra_packages/contact_alejandro/test/acurnier_2D_2.geo
similarity index 100%
rename from test/test_contact/acurnier_2D_2.geo
rename to extra_packages/contact_alejandro/test/acurnier_2D_2.geo
diff --git a/test/test_contact/acurnier_2D_3.cc b/extra_packages/contact_alejandro/test/acurnier_2D_3.cc
similarity index 100%
rename from test/test_contact/acurnier_2D_3.cc
rename to extra_packages/contact_alejandro/test/acurnier_2D_3.cc
diff --git a/test/test_contact/acurnier_2D_3.geo b/extra_packages/contact_alejandro/test/acurnier_2D_3.geo
similarity index 100%
rename from test/test_contact/acurnier_2D_3.geo
rename to extra_packages/contact_alejandro/test/acurnier_2D_3.geo
diff --git a/test/test_contact/acurnier_3D_1.cc b/extra_packages/contact_alejandro/test/acurnier_3D_1.cc
similarity index 100%
rename from test/test_contact/acurnier_3D_1.cc
rename to extra_packages/contact_alejandro/test/acurnier_3D_1.cc
diff --git a/test/test_contact/acurnier_3D_1.geo b/extra_packages/contact_alejandro/test/acurnier_3D_1.geo
similarity index 100%
rename from test/test_contact/acurnier_3D_1.geo
rename to extra_packages/contact_alejandro/test/acurnier_3D_1.geo
diff --git a/test/test_contact/acurnier_3D_2.cc b/extra_packages/contact_alejandro/test/acurnier_3D_2.cc
similarity index 100%
rename from test/test_contact/acurnier_3D_2.cc
rename to extra_packages/contact_alejandro/test/acurnier_3D_2.cc
diff --git a/test/test_contact/acurnier_3D_2.geo b/extra_packages/contact_alejandro/test/acurnier_3D_2.geo
similarity index 100%
rename from test/test_contact/acurnier_3D_2.geo
rename to extra_packages/contact_alejandro/test/acurnier_3D_2.geo
diff --git a/test/test_contact/acurnier_3D_3.cc b/extra_packages/contact_alejandro/test/acurnier_3D_3.cc
similarity index 100%
rename from test/test_contact/acurnier_3D_3.cc
rename to extra_packages/contact_alejandro/test/acurnier_3D_3.cc
diff --git a/test/test_contact/acurnier_3D_3.geo b/extra_packages/contact_alejandro/test/acurnier_3D_3.geo
similarity index 100%
rename from test/test_contact/acurnier_3D_3.geo
rename to extra_packages/contact_alejandro/test/acurnier_3D_3.geo
diff --git a/test/test_contact/hertz_2D.cc b/extra_packages/contact_alejandro/test/hertz_2D.cc
similarity index 100%
rename from test/test_contact/hertz_2D.cc
rename to extra_packages/contact_alejandro/test/hertz_2D.cc
diff --git a/test/test_contact/hertz_2D.geo b/extra_packages/contact_alejandro/test/hertz_2D.geo
similarity index 100%
rename from test/test_contact/hertz_2D.geo
rename to extra_packages/contact_alejandro/test/hertz_2D.geo
diff --git a/test/test_contact/hertz_3D.cc b/extra_packages/contact_alejandro/test/hertz_3D.cc
similarity index 100%
rename from test/test_contact/hertz_3D.cc
rename to extra_packages/contact_alejandro/test/hertz_3D.cc
diff --git a/test/test_contact/hertz_3D.msh b/extra_packages/contact_alejandro/test/hertz_3D.msh
similarity index 100%
rename from test/test_contact/hertz_3D.msh
rename to extra_packages/contact_alejandro/test/hertz_3D.msh
diff --git a/test/test_contact/material.dat b/extra_packages/contact_alejandro/test/material.dat
similarity index 100%
rename from test/test_contact/material.dat
rename to extra_packages/contact_alejandro/test/material.dat
diff --git a/test/test_contact/offset_1slave.cc b/extra_packages/contact_alejandro/test/offset_1slave.cc
similarity index 100%
rename from test/test_contact/offset_1slave.cc
rename to extra_packages/contact_alejandro/test/offset_1slave.cc
diff --git a/test/test_contact/offset_1slave.geo b/extra_packages/contact_alejandro/test/offset_1slave.geo
similarity index 100%
rename from test/test_contact/offset_1slave.geo
rename to extra_packages/contact_alejandro/test/offset_1slave.geo
diff --git a/test/test_contact/offset_2slaves.cc b/extra_packages/contact_alejandro/test/offset_2slaves.cc
similarity index 100%
rename from test/test_contact/offset_2slaves.cc
rename to extra_packages/contact_alejandro/test/offset_2slaves.cc
diff --git a/test/test_contact/offset_2slaves.geo b/extra_packages/contact_alejandro/test/offset_2slaves.geo
similarity index 100%
rename from test/test_contact/offset_2slaves.geo
rename to extra_packages/contact_alejandro/test/offset_2slaves.geo
diff --git a/test/test_contact/steel.dat b/extra_packages/contact_alejandro/test/steel.dat
similarity index 100%
rename from test/test_contact/steel.dat
rename to extra_packages/contact_alejandro/test/steel.dat
diff --git a/test/test_contact/test_acurnier_2D_1.verified b/extra_packages/contact_alejandro/test/test_acurnier_2D_1.verified
similarity index 100%
rename from test/test_contact/test_acurnier_2D_1.verified
rename to extra_packages/contact_alejandro/test/test_acurnier_2D_1.verified
diff --git a/test/test_contact/test_acurnier_2D_2.verified b/extra_packages/contact_alejandro/test/test_acurnier_2D_2.verified
similarity index 100%
rename from test/test_contact/test_acurnier_2D_2.verified
rename to extra_packages/contact_alejandro/test/test_acurnier_2D_2.verified
diff --git a/test/test_contact/test_acurnier_3D_1.verified b/extra_packages/contact_alejandro/test/test_acurnier_3D_1.verified
similarity index 100%
rename from test/test_contact/test_acurnier_3D_1.verified
rename to extra_packages/contact_alejandro/test/test_acurnier_3D_1.verified
diff --git a/test/test_contact/test_acurnier_3D_2.verified b/extra_packages/contact_alejandro/test/test_acurnier_3D_2.verified
similarity index 100%
rename from test/test_contact/test_acurnier_3D_2.verified
rename to extra_packages/contact_alejandro/test/test_acurnier_3D_2.verified
diff --git a/test/test_contact/test_acurnier_3D_3.verified b/extra_packages/contact_alejandro/test/test_acurnier_3D_3.verified
similarity index 100%
rename from test/test_contact/test_acurnier_3D_3.verified
rename to extra_packages/contact_alejandro/test/test_acurnier_3D_3.verified
diff --git a/test/test_contact/test_hertz_2D.verified b/extra_packages/contact_alejandro/test/test_hertz_2D.verified
similarity index 100%
rename from test/test_contact/test_hertz_2D.verified
rename to extra_packages/contact_alejandro/test/test_hertz_2D.verified
diff --git a/test/test_contact/test_hertz_3D.verified b/extra_packages/contact_alejandro/test/test_hertz_3D.verified
similarity index 100%
rename from test/test_contact/test_hertz_3D.verified
rename to extra_packages/contact_alejandro/test/test_hertz_3D.verified
diff --git a/test/test_contact/test_offset_1slave.verified b/extra_packages/contact_alejandro/test/test_offset_1slave.verified
similarity index 100%
rename from test/test_contact/test_offset_1slave.verified
rename to extra_packages/contact_alejandro/test/test_offset_1slave.verified
diff --git a/test/test_contact/test_offset_2slaves.verified b/extra_packages/contact_alejandro/test/test_offset_2slaves.verified
similarity index 100%
rename from test/test_contact/test_offset_2slaves.verified
rename to extra_packages/contact_alejandro/test/test_offset_2slaves.verified
diff --git a/extra_packages/traction-at-split-node-contact b/extra_packages/traction-at-split-node-contact
deleted file mode 160000
index 95926b0cf..000000000
--- a/extra_packages/traction-at-split-node-contact
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 95926b0cfda429a6c2adde41924aa2081892a7ad