diff --git a/sot-core3/DESCR b/sot-core3/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..b021b9de60cf54ae6cbc894ca0993703f8a77d34
--- /dev/null
+++ b/sot-core3/DESCR
@@ -0,0 +1 @@
+Hierarchical task based control of humanoid robots
diff --git a/sot-core3/Makefile b/sot-core3/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..10174136ce916d8a7c168f93a9721e29f63c3688
--- /dev/null
+++ b/sot-core3/Makefile
@@ -0,0 +1,48 @@
+# robotpkg Makefile for:	motion/sot-core3
+# Created:			Rohan Budhiraja on Wed Dec 16 15:33:40 CET 2015
+#
+
+PKGNAME=		sot-core-${VERSION}
+DISTNAME=		sot-core-${VERSION}
+VERSION=		3.0.0
+
+MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=sot-core/}
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}/proyan/sot-core
+CHECKOUT_VCS_OPTS=	--recursive
+
+MAINTAINER=	gepetto@laas.fr
+CATEGORIES=	wip
+COMMENT=	Hierarchical task based control of humanoid robots
+LICENSE=	gnu-lgpl-v3
+
+WRKSRC=		${WRKDIR}/${DISTNAME:a=}
+
+DYNAMIC_PLIST_DIRS+=	share/doc/sot-core
+
+CMAKE_ARGS+=		-DPYTHON_EXECUTABLE=${PYTHON}
+CMAKE_ARGS+=		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE}
+CMAKE_ARGS+=		-DPYTHON_LIBRARY=${PYTHON_LIB}
+CMAKE_ARGS+=		-DPYTHON_SITELIB=${PYTHON_SITELIB}
+CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
+
+# Build the package in a separate directory
+CONFIGURE_DIRS=		_build
+CMAKE_ARG_PATH=		..
+
+include ../../devel/boost-headers/depend.mk
+include ../../devel/boost-libs/depend.mk
+include ../../math/eigen3/depend.mk
+include ../../wip/py-dynamic-graph3/depend.mk
+include ../../pkgtools/pkg-config/depend.mk
+include ../../mk/sysdep/cmake.mk
+include ../../mk/sysdep/doxygen.mk
+include ../../mk/sysdep/graphviz.mk
+include ../../mk/sysdep/pdflatex.mk
+include ../../mk/sysdep/py-sphinx.mk
+include ../../mk/sysdep/python.mk
+include ../../mk/language/c.mk
+include ../../mk/language/c++.mk
+include ../../mk/robotpkg.mk
+
+pre-configure:
+	${RUN}${MKDIR} ${WRKSRC}/_build
diff --git a/sot-core3/PLIST b/sot-core3/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..d9a5421f6a9f33f6a1d69dc0a571f38f63df7884
--- /dev/null
+++ b/sot-core3/PLIST
@@ -0,0 +1,286 @@
+@comment Mon Nov 18 11:56:00 CET 2013
+include/sot/core/abstract-sot-external-interface.hh
+include/sot/core/additional-functions.hh
+include/sot/core/api.hh
+include/sot/core/binary-int-to-uint.hh
+include/sot/core/binary-op.hh
+include/sot/core/clamp-workspace.hh
+include/sot/core/com-freezer.hh
+include/sot/core/config.h
+include/sot/core/config.hh
+include/sot/core/constraint.hh
+include/sot/core/contiifstream.hh
+include/sot/core/debug.hh
+include/sot/core/deprecated.hh
+include/sot/core/derivator.hh
+include/sot/core/device.hh
+include/sot/core/exception-abstract.hh
+include/sot/core/exception-dynamic.hh
+include/sot/core/exception-factory.hh
+include/sot/core/exception-feature.hh
+include/sot/core/exception-signal.hh
+include/sot/core/exception-task.hh
+include/sot/core/exception-tools.hh
+include/sot/core/factory.hh
+include/sot/core/feature-1d.hh
+include/sot/core/feature-abstract.hh
+include/sot/core/feature-generic.hh
+include/sot/core/feature-joint-limits.hh
+include/sot/core/feature-line-distance.hh
+include/sot/core/feature-point6d-relative.hh
+include/sot/core/feature-point6d.hh
+include/sot/core/feature-posture.hh
+include/sot/core/feature-task.hh
+include/sot/core/feature-vector3.hh
+include/sot/core/feature-visual-point.hh
+include/sot/core/fir-filter.hh
+include/sot/core/flags.hh
+include/sot/core/gain-adaptive.hh
+include/sot/core/gain-hyperbolic.hh
+include/sot/core/gripper-control.hh
+include/sot/core/integrator-abstract.hh
+include/sot/core/integrator-euler.hh
+include/sot/core/joint-limitator.hh
+include/sot/core/kalman.hh
+include/sot/core/macros-signal.hh
+include/sot/core/mailbox-vector.hh
+include/sot/core/mailbox.hh
+include/sot/core/mailbox.hxx
+include/sot/core/matrix-constant.hh
+include/sot/core/matrix-geometry.hh
+include/sot/core/matrix-svd.hh
+include/sot/core/memory-task-sot.hh
+include/sot/core/motion-period.hh
+include/sot/core/multi-bound.hh
+include/sot/core/neck-limitation.hh
+include/sot/core/op-point-modifier.hh
+include/sot/core/periodic-call-entity.hh
+include/sot/core/periodic-call.hh
+include/sot/core/pool.hh
+include/sot/core/reader.hh
+include/sot/core/robot-simu.hh
+include/sot/core/sot.hh
+include/sot/core/task-abstract.hh
+include/sot/core/task-conti.hh
+include/sot/core/task-pd.hh
+include/sot/core/task-unilateral.hh
+include/sot/core/task.hh
+include/sot/core/time-stamp.hh
+include/sot/core/timer.hh
+include/sot/core/trajectory.hh
+include/sot/core/unary-op.hh
+include/sot/core/utils-windows.hh
+include/sot/core/vector-constant.hh
+include/sot/core/vector-to-rotation.hh
+include/sot/core/visual-point-projecter.hh
+include/sot/core/warning.hh
+lib/libsot-core.so
+lib/libsot-core.so.${PKGVERSION}
+lib/pkgconfig/sot-core.pc
+lib/plugin/binary-int-to-uint.so
+lib/plugin/binary-int-to-uint.so.${PKGVERSION}
+lib/plugin/clamp-workspace.so
+lib/plugin/clamp-workspace.so.${PKGVERSION}
+lib/plugin/com-freezer.so
+lib/plugin/com-freezer.so.${PKGVERSION}
+lib/plugin/constraint.so
+lib/plugin/constraint.so.${PKGVERSION}
+lib/plugin/control-gr.so
+lib/plugin/control-gr.so.${PKGVERSION}
+lib/plugin/control-pd.so
+lib/plugin/control-pd.so.${PKGVERSION}
+lib/plugin/derivator.so
+lib/plugin/derivator.so.${PKGVERSION}
+lib/plugin/feature-1d.so
+lib/plugin/feature-1d.so.${PKGVERSION}
+lib/plugin/feature-generic.so
+lib/plugin/feature-generic.so.${PKGVERSION}
+lib/plugin/feature-joint-limits.so
+lib/plugin/feature-joint-limits.so.${PKGVERSION}
+lib/plugin/feature-line-distance.so
+lib/plugin/feature-line-distance.so.${PKGVERSION}
+lib/plugin/feature-point6d-relative.so
+lib/plugin/feature-point6d-relative.so.${PKGVERSION}
+lib/plugin/feature-point6d.so
+lib/plugin/feature-point6d.so.${PKGVERSION}
+lib/plugin/feature-posture.so
+lib/plugin/feature-posture.so.${PKGVERSION}
+lib/plugin/feature-task.so
+lib/plugin/feature-task.so.${PKGVERSION}
+lib/plugin/feature-vector3.so
+lib/plugin/feature-vector3.so.${PKGVERSION}
+lib/plugin/feature-visual-point.so
+lib/plugin/feature-visual-point.so.${PKGVERSION}
+lib/plugin/fir-filter.so
+lib/plugin/fir-filter.so.${PKGVERSION}
+lib/plugin/gain-adaptive.so
+lib/plugin/gain-adaptive.so.${PKGVERSION}
+lib/plugin/gain-hyperbolic.so
+lib/plugin/gain-hyperbolic.so.${PKGVERSION}
+lib/plugin/gripper-control.so
+lib/plugin/gripper-control.so.${PKGVERSION}
+lib/plugin/integrator-abstract.so
+lib/plugin/integrator-abstract.so.${PKGVERSION}
+lib/plugin/integrator-euler.so
+lib/plugin/integrator-euler.so.${PKGVERSION}
+lib/plugin/joint-limitator.so
+lib/plugin/joint-limitator.so.${PKGVERSION}
+lib/plugin/joint-trajectory-entity.so
+lib/plugin/joint-trajectory-entity.so.${PKGVERSION}
+lib/plugin/kalman.so
+lib/plugin/kalman.so.${PKGVERSION}
+lib/plugin/mailbox-vector.so
+lib/plugin/mailbox-vector.so.${PKGVERSION}
+lib/plugin/matrix-constant.so
+lib/plugin/matrix-constant.so.${PKGVERSION}
+lib/plugin/motion-period.so
+lib/plugin/motion-period.so.${PKGVERSION}
+lib/plugin/neck-limitation.so
+lib/plugin/neck-limitation.so.${PKGVERSION}
+lib/plugin/op-point-modifier.so
+lib/plugin/op-point-modifier.so.${PKGVERSION}
+lib/plugin/operator.so
+lib/plugin/operator.so.${PKGVERSION}
+lib/plugin/periodic-call-entity.so
+lib/plugin/periodic-call-entity.so.${PKGVERSION}
+lib/plugin/reader.so
+lib/plugin/reader.so.${PKGVERSION}
+lib/plugin/robot-simu.so
+lib/plugin/robot-simu.so.${PKGVERSION}
+lib/plugin/seq-play.so
+lib/plugin/seq-play.so.${PKGVERSION}
+lib/plugin/sequencer.so
+lib/plugin/sequencer.so.${PKGVERSION}
+lib/plugin/sot.so
+lib/plugin/sot.so.${PKGVERSION}
+lib/plugin/task-conti.so
+lib/plugin/task-conti.so.${PKGVERSION}
+lib/plugin/task-pd.so
+lib/plugin/task-pd.so.${PKGVERSION}
+lib/plugin/task-unilateral.so
+lib/plugin/task-unilateral.so.${PKGVERSION}
+lib/plugin/task.so
+lib/plugin/task.so.${PKGVERSION}
+lib/plugin/time-stamp.so
+lib/plugin/time-stamp.so.${PKGVERSION}
+lib/plugin/timer.so
+lib/plugin/timer.so.${PKGVERSION}
+lib/plugin/vector-constant.so
+lib/plugin/vector-constant.so.${PKGVERSION}
+lib/plugin/vector-to-rotation.so
+lib/plugin/vector-to-rotation.so.${PKGVERSION}
+lib/plugin/visual-point-projecter.so
+lib/plugin/visual-point-projecter.so.${PKGVERSION}
+${PYTHON_SITELIB}/dynamic_graph/sot/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/binary_int_to_uint/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/binary_int_to_uint/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/clamp_workspace/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/clamp_workspace/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/com_freezer/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/com_freezer/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/constraint/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/constraint/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/control_gr/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/control_gr/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/control_pd/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/control_pd/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/derivator/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/derivator/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_1d/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_1d/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_generic/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_generic/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_joint_limits/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_joint_limits/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_line_distance/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_line_distance/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_point6d/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_point6d/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_point6d_relative/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_point6d_relative/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_position.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_position_relative.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_posture/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_posture/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_task/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_task/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_vector3/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_vector3/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_visual_point/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/feature_visual_point/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/fir_filter/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/fir_filter/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/gain_adaptive/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/gain_adaptive/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/gain_hyperbolic/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/gain_hyperbolic/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/gripper_control/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/gripper_control/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/integrator_abstract/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/integrator_abstract/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/integrator_euler/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/integrator_euler/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/joint_limitator/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/joint_limitator/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/joint_trajectory_entity/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/joint_trajectory_entity/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/kalman/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/kalman/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/mailbox_vector/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/mailbox_vector/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/math_small_entities.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/matrix_constant/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/matrix_constant/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/matrix_util.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/meta_task_6d.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/meta_task_posture.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/meta_task_visual_point.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/meta_tasks.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/meta_tasks_kine.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/meta_tasks_kine_relative.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/motion_period/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/motion_period/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/neck_limitation/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/neck_limitation/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/op_point_modifier/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/op_point_modifier/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/operator/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/operator/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/periodic_call_entity/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/periodic_call_entity/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/reader/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/reader/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/robot_simu/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/robot_simu/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/seq_play/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/seq_play/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/sequencer/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/sequencer/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/sot/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/sot/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task_conti/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task_conti/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task_pd/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task_pd/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task_unilateral/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/task_unilateral/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/time_stamp/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/time_stamp/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/timer/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/timer/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/utils/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/utils/attime.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/utils/history.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/utils/thread_interruptible_loop.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/utils/viewer_helper.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/utils/viewer_loger.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/vector_constant/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/vector_constant/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/vector_to_rotation/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/vector_to_rotation/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/visual_point_projecter/__init__.py
+${PYTHON_SITELIB}/dynamic_graph/sot/core/visual_point_projecter/wrap.so
+${PYTHON_SITELIB}/dynamic_graph/sot/core/wrap.so
diff --git a/sot-core3/depend.mk b/sot-core3/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..b6d2f93260e30ea347f60a6973751a671bdf70f8
--- /dev/null
+++ b/sot-core3/depend.mk
@@ -0,0 +1,28 @@
+# robotpkg depend.mk for:	wip/sot-core
+# Created:			Rohan Budhiraja on Thu, 17 Dec 2015
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+SOT_CORE_DEPEND_MK:=	${SOT_CORE_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		sot-core
+endif
+
+ifeq (+,$(SOT_CORE_DEPEND_MK)) # -------------------------------------------
+
+PREFER.sot-core?=	robotpkg
+
+SYSTEM_SEARCH.sot-core=\
+	include/sot/core/device.hh				\
+	lib/libsot-core.so					\
+	'lib/pkgconfig/sot-core.pc:/Version/s/[^0-9.]//gp'
+
+DEPEND_USE+=		sot-core
+
+DEPEND_ABI.sot-core?=	sot-core>=3.0.0
+DEPEND_DIR.sot-core?=	../../wip/sot-core3
+
+endif # SOT_CORE_DEPEND_MK -------------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/sot-core3/distinfo b/sot-core3/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..2e42e08861620352e94c1b44a67da0a3246b8e12
--- /dev/null
+++ b/sot-core3/distinfo
@@ -0,0 +1,3 @@
+SHA1 (sot-core-3.0.0.tar.gz) = e4968c00d55526c69bbcef9a472bcca9b35ae518
+RMD160 (sot-core-3.0.0.tar.gz) = 9b7dc959a0550ab765b9f1ae5e8088c85653c0e3
+Size (sot-core-3.0.0.tar.gz) = 365510 bytes