diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc23c93..0ea2906 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,37 +1,21 @@
 project(liboncilla-hw C CXX)
 cmake_minimum_required(VERSION 2.8)
 
 
+find_package(BiorobCMakeUtils REQUIRED)
+include_all_biorob_cmake_utils()
 
-set(MAJOR_VERSION 0)
-set(MINOR_VERSION 1)
-set(PATCH_VERSION 0)
-
-set(API_VERSION ${MAJOR_VERSION}.${MINOR_VERSION})
-
-if(${MAJOR_VERSION} EQUAL 0)
-  set(ABI_VERSION ${API_VERSION})
-else(${MAJOR_VERSION} EQUAL 0)
-  set(ABI_VERSION ${MAJOR_VERSION})
-endif(${MAJOR_VERSION} EQUAL 0)
-
-set(VERSION_STRING ${API_VERSION}.${PATCH_VERSION})
-
+make_std_versionning(MAJOR 0 MINOR 0 PATCH 1) 
 
 find_package(PkgConfig REQUIRED)
 
 
-pkg_check_modules(LIBSBCP libsbcp-0 REQUIRED)
-pkg_check_modules(BIOROB_RBIO biorob-rbio-0 REQUIRED)
-pkg_check_modules(LIBONCILLA liboncilla-0 REQUIRED)
-
-include_directories(${LIBSBCP_INCLUDE_DIRS} ${BIOROB_RBIO_INCLUDE_DIRS}
-${LIBONCILLA_INCLUDE_DIRS})
+pkg_check_modules(DEPS REQUIRED liboncilla-0)
 
-set(INCLUDE_DIR include/liboncilla-hw-${API_VERSION})
+include_directories(${DEPS_INCLUDE_DIRS})
 
 add_subdirectory(src)
 
 
 
 
diff --git a/src/liboncilla-hw/.gitignore b/src/liboncilla-hw/.gitignore
new file mode 100644
index 0000000..0778ba7
--- /dev/null
+++ b/src/liboncilla-hw/.gitignore
@@ -0,0 +1,2 @@
+liboncilla.so*
+liboncilla.dylib*
diff --git a/src/liboncilla-hw/CMakeLists.txt b/src/liboncilla-hw/CMakeLists.txt
index ae49dcc..7b2a438 100644
--- a/src/liboncilla-hw/CMakeLists.txt
+++ b/src/liboncilla-hw/CMakeLists.txt
@@ -1,16 +1,8 @@
-set(SRC_FILES OncillaHWSupervisor.cpp)
-set(HDR_FILES OncillaHWSupervisor.h)
+set(SRC_FILES )
+set(HDR_FILES )
 
-add_library(oncilla-hw SHARED ${SRC_FILES} ${HDR_FILES} )
-
-target_link_libraries(oncilla-hw ${SBCPD_LIBRARIES} ${LIBONCILLA_LIBRARIES}
-${BIOROB_RBIO_LIBRARIES})
+add_library(oncilla-hw MODULE ${SRC_FILES} ${HDR_FILES} )
 
+target_link_libraries(oncilla-hw ${DEPS_LIBRARIES})
 
 install(TARGETS oncilla-hw DESTINATION lib)
-
-
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/liboncilla-hw
-        DESTINATION ${INCLUDE_DIR}
-        FILES_MATCHING PATTERN "*.h"
-                       PATTERN "CMakeFiles*" EXCLUDE)
\ No newline at end of file
diff --git a/src/liboncilla-hw/OncillaHWSupervisor.cpp b/src/liboncilla-hw/OncillaHWSupervisor.cpp
deleted file mode 100644
index 7a9d9b5..0000000
--- a/src/liboncilla-hw/OncillaHWSupervisor.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * \file OncillaHWSupervisor.cpp
- *
- *  \date May 1, 2012
- *  \author Alexandre Tuleu
- */
-
-#include "OncillaHWSupervisor.h"
-
-
-
-OncillaHWSupervisor::OncillaHWSupervisor(){
-	// TODO Auto-generated constructor stub
-
-}
-
-OncillaHWSupervisor::~OncillaHWSupervisor(){
-	// TODO Auto-generated destructor stub
-}
-
-
diff --git a/src/liboncilla-hw/OncillaHWSupervisor.h b/src/liboncilla-hw/OncillaHWSupervisor.h
deleted file mode 100644
index dd14894..0000000
--- a/src/liboncilla-hw/OncillaHWSupervisor.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * \file OncillaHWSupervisor.h
- *
- *  \date May 1, 2012
- *  \author Alexandre Tuleu
- */
-
-#ifndef LIBONCILLA_HW_ONCILLAHWSUPERVISOR_H_
-#define LIBONCILLA_HW_ONCILLAHWSUPERVISOR_H_
-
-/**
- *
- */
-
-/**
- *
- */
-class OncillaHWSupervisor {
-public:
-	OncillaHWSupervisor();
-	virtual ~OncillaHWSupervisor();
-};
-
-#endif // LIBONCILLA_HW_ONCILLAHWSUPERVISOR_H_
diff --git a/src/liboncilla-hw/liboncilla-hw.so b/src/liboncilla-hw/liboncilla-hw.so
deleted file mode 100755
index 3f6656b..0000000
Binary files a/src/liboncilla-hw/liboncilla-hw.so and /dev/null differ