diff --git a/README.md b/README.md
index a303d28..db99591 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,11 @@ Thus refrences are required for the module to work properly. It can be loaded th
### Done
### Todo
-ASIFT_matcher : Issue on total number of match (after filtering ?).
-ROS_matcher : Working loader of images for reference.
-ROS_matcher : Improve reactivity. Slow process due to the message queue length ?
-ROS_matcher : Swap the callback function to a service called for matching.
+rviz_interface - InteractiveObject : Solve the issue with the frame_id, so it could be chosen in the launch file.
+asift_matching - ASIFT_matcher : Issue on total number of match (after filtering ?).
+asift_matching - ROS_matcher : Working loader of images for reference.
+asift_matching - ROS_matcher : Improve reactivity. Slow process due to the message queue length ?
+asift_matching - ROS_matcher : Swap the callback function to a service called for matching.
## How to use it ?
diff --git a/README.md~ b/README.md~
index 93e45be..a303d28 100644
--- a/README.md~
+++ b/README.md~
@@ -30,9 +30,10 @@ Thus refrences are required for the module to work properly. It can be loaded th
### Done
### Todo
-REGLER LE PROBLEME DE FRAME ...
-Problème dans le filtrage : nombre de points _> probleme de reset du nombre
-ROS wrapper can't load images
+ASIFT_matcher : Issue on total number of match (after filtering ?).
+ROS_matcher : Working loader of images for reference.
+ROS_matcher : Improve reactivity. Slow process due to the message queue length ?
+ROS_matcher : Swap the callback function to a service called for matching.
## How to use it ?
diff --git a/rviz_interface/interface_tests/CMakeLists.txt b/ongoing/interface_tests/CMakeLists.txt
similarity index 100%
rename from rviz_interface/interface_tests/CMakeLists.txt
rename to ongoing/interface_tests/CMakeLists.txt
diff --git a/rviz_interface/interface_tests/CMakeLists.txt~ b/ongoing/interface_tests/CMakeLists.txt~
similarity index 100%
rename from rviz_interface/interface_tests/CMakeLists.txt~
rename to ongoing/interface_tests/CMakeLists.txt~
diff --git a/rviz_interface/interface_tests/msg/InterfaceConfigT.msg b/ongoing/interface_tests/msg/InterfaceConfigT.msg
similarity index 100%
rename from rviz_interface/interface_tests/msg/InterfaceConfigT.msg
rename to ongoing/interface_tests/msg/InterfaceConfigT.msg
diff --git a/rviz_interface/interface_tests/msg/StateSpace.msg~ b/ongoing/interface_tests/msg/StateSpace.msg~
similarity index 100%
rename from rviz_interface/interface_tests/msg/StateSpace.msg~
rename to ongoing/interface_tests/msg/StateSpace.msg~
diff --git a/rviz_interface/interface_tests/msg/StateSpaceT.msg b/ongoing/interface_tests/msg/StateSpaceT.msg
similarity index 100%
rename from rviz_interface/interface_tests/msg/StateSpaceT.msg
rename to ongoing/interface_tests/msg/StateSpaceT.msg
diff --git a/rviz_interface/interface_tests/package.xml b/ongoing/interface_tests/package.xml
similarity index 100%
rename from rviz_interface/interface_tests/package.xml
rename to ongoing/interface_tests/package.xml
diff --git a/rviz_interface/interface_tests/package.xml~ b/ongoing/interface_tests/package.xml~
similarity index 100%
rename from rviz_interface/interface_tests/package.xml~
rename to ongoing/interface_tests/package.xml~
diff --git a/rviz_interface/interface_tests/panel_plugin.xml b/ongoing/interface_tests/panel_plugin.xml
similarity index 100%
rename from rviz_interface/interface_tests/panel_plugin.xml
rename to ongoing/interface_tests/panel_plugin.xml
diff --git a/rviz_interface/interface_tests/panel_plugin.xml~ b/ongoing/interface_tests/panel_plugin.xml~
similarity index 100%
rename from rviz_interface/interface_tests/panel_plugin.xml~
rename to ongoing/interface_tests/panel_plugin.xml~
diff --git a/rviz_interface/interface_tests/plugin_description.xml~ b/ongoing/interface_tests/plugin_description.xml~
similarity index 100%
rename from rviz_interface/interface_tests/plugin_description.xml~
rename to ongoing/interface_tests/plugin_description.xml~
diff --git a/rviz_interface/interface_tests/src/interface_test.cpp b/ongoing/interface_tests/src/interface_test.cpp
similarity index 100%
rename from rviz_interface/interface_tests/src/interface_test.cpp
rename to ongoing/interface_tests/src/interface_test.cpp
diff --git a/rviz_interface/interface_tests/src/listener_test.cpp b/ongoing/interface_tests/src/listener_test.cpp
similarity index 100%
rename from rviz_interface/interface_tests/src/listener_test.cpp
rename to ongoing/interface_tests/src/listener_test.cpp
diff --git a/rviz_interface/interface_tests/src/marker_test.cpp b/ongoing/interface_tests/src/marker_test.cpp
similarity index 100%
rename from rviz_interface/interface_tests/src/marker_test.cpp
rename to ongoing/interface_tests/src/marker_test.cpp
diff --git a/rviz_interface/interface_tests/src/panel_test.cpp b/ongoing/interface_tests/src/panel_test.cpp
similarity index 100%
rename from rviz_interface/interface_tests/src/panel_test.cpp
rename to ongoing/interface_tests/src/panel_test.cpp
diff --git a/rviz_interface/interface_tests/src/panel_test.hpp b/ongoing/interface_tests/src/panel_test.hpp
similarity index 100%
rename from rviz_interface/interface_tests/src/panel_test.hpp
rename to ongoing/interface_tests/src/panel_test.hpp
diff --git a/rviz_interface/rviz_interface/CMakeLists.txt b/rviz_interface/CMakeLists.txt
similarity index 100%
rename from rviz_interface/rviz_interface/CMakeLists.txt
rename to rviz_interface/CMakeLists.txt
diff --git a/rviz_interface/rviz_interface/launch/interface.launch b/rviz_interface/launch/interface.launch
similarity index 100%
rename from rviz_interface/rviz_interface/launch/interface.launch
rename to rviz_interface/launch/interface.launch
diff --git a/rviz_interface/rviz_interface/launch/interface.launch~ b/rviz_interface/launch/interface.launch~
similarity index 100%
rename from rviz_interface/rviz_interface/launch/interface.launch~
rename to rviz_interface/launch/interface.launch~
diff --git a/rviz_interface/rviz_interface/launch/interface_camera.launch~ b/rviz_interface/launch/interface_camera.launch~
similarity index 100%
rename from rviz_interface/rviz_interface/launch/interface_camera.launch~
rename to rviz_interface/launch/interface_camera.launch~
diff --git a/rviz_interface/rviz_interface/launch/interface_matching.launch b/rviz_interface/launch/interface_matching.launch
similarity index 100%
rename from rviz_interface/rviz_interface/launch/interface_matching.launch
rename to rviz_interface/launch/interface_matching.launch
diff --git a/rviz_interface/rviz_interface/launch/interface_matching.launch~ b/rviz_interface/launch/interface_matching.launch~
similarity index 100%
rename from rviz_interface/rviz_interface/launch/interface_matching.launch~
rename to rviz_interface/launch/interface_matching.launch~
diff --git a/rviz_interface/rviz_interface/launch/interface_plannar_seg.launch b/rviz_interface/launch/interface_plannar_seg.launch
similarity index 100%
rename from rviz_interface/rviz_interface/launch/interface_plannar_seg.launch
rename to rviz_interface/launch/interface_plannar_seg.launch
diff --git a/rviz_interface/rviz_interface/launch/interface_plannar_seg.launch~ b/rviz_interface/launch/interface_plannar_seg.launch~
similarity index 100%
rename from rviz_interface/rviz_interface/launch/interface_plannar_seg.launch~
rename to rviz_interface/launch/interface_plannar_seg.launch~
diff --git a/rviz_interface/rviz_interface/msg/InterfaceConfig.msg b/rviz_interface/msg/InterfaceConfig.msg
similarity index 100%
rename from rviz_interface/rviz_interface/msg/InterfaceConfig.msg
rename to rviz_interface/msg/InterfaceConfig.msg
diff --git a/rviz_interface/rviz_interface/msg/InterfaceConfig.msg~ b/rviz_interface/msg/InterfaceConfig.msg~
similarity index 100%
rename from rviz_interface/rviz_interface/msg/InterfaceConfig.msg~
rename to rviz_interface/msg/InterfaceConfig.msg~
diff --git a/rviz_interface/rviz_interface/msg/NamedPoint.msg b/rviz_interface/msg/NamedPoint.msg
similarity index 100%
rename from rviz_interface/rviz_interface/msg/NamedPoint.msg
rename to rviz_interface/msg/NamedPoint.msg
diff --git a/rviz_interface/rviz_interface/msg/NamedPoint.msg~ b/rviz_interface/msg/NamedPoint.msg~
similarity index 100%
rename from rviz_interface/rviz_interface/msg/NamedPoint.msg~
rename to rviz_interface/msg/NamedPoint.msg~
diff --git a/rviz_interface/rviz_interface/msg/StateSpace.msg b/rviz_interface/msg/StateSpace.msg
similarity index 100%
rename from rviz_interface/rviz_interface/msg/StateSpace.msg
rename to rviz_interface/msg/StateSpace.msg
diff --git a/rviz_interface/rviz_interface/msg/StateSpace.msg~ b/rviz_interface/msg/StateSpace.msg~
similarity index 100%
rename from rviz_interface/rviz_interface/msg/StateSpace.msg~
rename to rviz_interface/msg/StateSpace.msg~
diff --git a/rviz_interface/rviz_interface/package.xml b/rviz_interface/package.xml
similarity index 100%
rename from rviz_interface/rviz_interface/package.xml
rename to rviz_interface/package.xml
diff --git a/rviz_interface/rviz_interface/panel_plugin.xml b/rviz_interface/panel_plugin.xml
similarity index 100%
rename from rviz_interface/rviz_interface/panel_plugin.xml
rename to rviz_interface/panel_plugin.xml
diff --git a/rviz_interface/rviz_interface/CMakeLists.txt~ b/rviz_interface/rviz_interface/CMakeLists.txt~
deleted file mode 100644
index 7de1a9e..0000000
--- a/rviz_interface/rviz_interface/CMakeLists.txt~
+++ /dev/null
@@ -1,214 +0,0 @@
-cmake_minimum_required(VERSION 2.8.3)
-project(rviz_interface)
-
-## Compile as C++11, supported in ROS Kinetic and newer
-# add_compile_options(-std=c++11)
-
-## Find catkin macros and libraries
-## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
-## is used, also find other catkin packages
-find_package(catkin REQUIRED COMPONENTS interactive_markers roscpp visualization_msgs tf rospy std_msgs message_generation genmsg)
-
-################################################
-## Declare ROS messages, services and actions ##
-################################################
-
-## To declare and build messages, services or actions from within this
-## package, follow these steps:
-## * Let MSG_DEP_SET be the set of packages whose message types you use in
-## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
-## * In the file package.xml:
-## * add a build_depend tag for "message_generation"
-## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
-## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
-## but can be declared for certainty nonetheless:
-## * add a exec_depend tag for "message_runtime"
-## * In this file (CMakeLists.txt):
-## * add "message_generation" and every package in MSG_DEP_SET to
-## find_package(catkin REQUIRED COMPONENTS ...)
-## * add "message_runtime" and every package in MSG_DEP_SET to
-## catkin_package(CATKIN_DEPENDS ...)
-## * uncomment the add_*_files sections below as needed
-## and list every .msg/.srv/.action file to be processed
-## * uncomment the generate_messages entry below
-## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
-
-## Generate messages in the 'msg' folder
-add_message_files(
- FILES
- StateSpace.msg
- InterfaceConfig.msg
- NamedPoint.msg
-)
-
-## Generate services in the 'srv' folder
-# add_service_files(
-# FILES
-# Service1.srv
-# Service2.srv
-# )
-
-## Generate actions in the 'action' folder
-# add_action_files(
-# FILES
-# Action1.action
-# Action2.action
-# )
-
-## Generate added messages and services with any dependencies listed here
-generate_messages(
- DEPENDENCIES
- std_msgs
- geometry_msgs
-)
-
-###################################
-## catkin specific configuration ##
-###################################
-## The catkin_package macro generates cmake config files for your package
-## Declare things to be passed to dependent projects
-## LIBRARIES: libraries you create in this project that dependent projects also need
-## CATKIN_DEPENDS: catkin_packages dependent projects also need
-## DEPENDS: system dependencies of this project that dependent projects also need
-catkin_package(
- CATKIN_DEPENDS interactive_markers roscpp visualization_msgs tf message_runtime
-)
-
-## QT ##
-## This setting causes Qt's "MOC" generation to happen automatically.
-set(CMAKE_AUTOMOC ON)
-
-## This plugin includes Qt widgets, so we must include Qt.
-## We'll use the version that rviz used so they are compatible.
-if(rviz_QT_VERSION VERSION_LESS "5")
- message(STATUS "Using Qt4 based on the rviz_QT_VERSION: ${rviz_QT_VERSION}")
- find_package(Qt4 ${rviz_QT_VERSION} EXACT REQUIRED QtCore QtGui)
- ## pull in all required include dirs, define QT_LIBRARIES, etc.
- include(${QT_USE_FILE})
-else()
- message(STATUS "Using Qt5 based on the rviz_QT_VERSION: ${rviz_QT_VERSION}")
- find_package(Qt5 ${rviz_QT_VERSION} EXACT REQUIRED Core Widgets)
- ## make target_link_libraries(${QT_LIBRARIES}) pull in all required dependencies
- set(QT_LIBRARIES Qt5::Widgets)
-endif()
-
-## I prefer the Qt signals and slots to avoid defining "emit", "slots",
-## etc because they can conflict with boost signals, so define QT_NO_KEYWORDS here.
-add_definitions(-DQT_NO_KEYWORDS)
-
-###########
-## Build ##
-###########
-
-## Specify additional locations of header files
-## Your package locations should be listed before other locations
-include_directories(include
- ${catkin_INCLUDE_DIRS}
-)
-
-## Here we specify the list of source files for the panel.
-## The generated MOC files are included automatically as headers.
-set(SRC_FILES
- src/InterfacePanel.cpp
-)
-
-## Declare a C++ library
-# add_library(${PROJECT_NAME}
-# src/${PROJECT_NAME}/beginner_tutorials.cpp
-# )
-## An rviz plugin is just a shared library, so here we declare the
-## library to be called ``${PROJECT_NAME}`` (which is
-## "rviz_plugin_tutorials", or whatever your version of this project
-## is called) and specify the list of source files we collected above
-## in ``${SRC_FILES}``.
-add_library(${PROJECT_NAME} ${SRC_FILES})
-#add_library(rviz_interface_plugin src/panel_test.cpp)
-
-## Link the myviz executable with whatever Qt libraries have been defined by
-## the ``find_package(Qt4 ...)`` line above, or by the
-## ``set(QT_LIBRARIES Qt5::Widgets)``, and with whatever libraries
-## catkin has included.
-##
-## Although this puts "rviz_plugin_tutorials" (or whatever you have
-## called the project) as the name of the library, cmake knows it is a
-## library and names the actual file something like
-## "librviz_plugin_tutorials.so", or whatever is appropriate for your
-## particular OS.
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES})
-
-
-## Add cmake target dependencies of the library
-## as an example, code may need to be generated before libraries
-## either from message generation or dynamic reconfigure
-# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
-
-## Declare a C++ executable
-## With catkin_make all packages are built within a single CMake context
-## The recommended prefix ensures that target names across packages don't collide
-add_executable(RvizInterface src/RvizInterface.cpp src/InteractiveObject.cpp)
-target_link_libraries(RvizInterface ${catkin_LIBRARIES})
-
-
-## Add cmake target dependencies of the executable
-## same as for the library above
-# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
-add_dependencies(RvizInterface ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
-
-## Specify libraries to link a library or executable target against
-# target_link_libraries(${PROJECT_NAME}_node
-# ${catkin_LIBRARIES}
-# )
-
-#############
-## Install ##
-#############
-
-## Mark executable scripts (Python etc.) for installation
-## in contrast to setup.py, you can choose the destination
-
-#install(PROGRAMS
- #scripts/basic_controls.py
- #scripts/cube.py
- #scripts/menu.py
- #scripts/simple_marker.py
- #DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-#)
-
-## Mark executables and/or libraries for installation
-install(TARGETS
- RvizInterface
- ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
- LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
- RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-)
-
-
-## Mark cpp header files for installation
-# install(DIRECTORY include/${PROJECT_NAME}/
-# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-# FILES_MATCHING PATTERN "*.h"
-# PATTERN ".svn" EXCLUDE
-# )
-
-## Mark other files for installation (e.g. launch and bag files, etc.)
-# install(FILES
-# # myfile1
-# # myfile2
-# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-# )
-install(FILES
- panel_plugin.xml
- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
-
-#############
-## Testing ##
-#############
-
-## Add gtest based cpp test target and link libraries
-# catkin_add_gtest(${PROJECT_NAME}-test test/test_beginner_tutorials.cpp)
-# if(TARGET ${PROJECT_NAME}-test)
-# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
-# endif()
-
-## Add folders to be run by python nosetests
-# catkin_add_nosetests(test)
diff --git a/rviz_interface/rviz_interface/package.xml~ b/rviz_interface/rviz_interface/package.xml~
deleted file mode 100644
index 4a0f66a..0000000
--- a/rviz_interface/rviz_interface/package.xml~
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
- rviz_interface
- 0.0.0
- The rviz_interface package
-
-
-
-
- blue
-
-
-
-
-
- TODO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- roscpp
- interactive_markers
- visualization_msgs
- tf
-
- roscpp
- interactive_markers
- visualization_msgs
- tf
-
- message_generation
- message_runtime
-
- catkin
-
-
-
-
-
-
-
diff --git a/rviz_interface/rviz_interface/panel_plugin.xml~ b/rviz_interface/rviz_interface/panel_plugin.xml~
deleted file mode 100644
index 1a51891..0000000
--- a/rviz_interface/rviz_interface/panel_plugin.xml~
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- A panel for an Rviz Interface.
-
-
-
diff --git a/rviz_interface/rviz_interface/setup.py b/rviz_interface/setup.py
similarity index 100%
rename from rviz_interface/rviz_interface/setup.py
rename to rviz_interface/setup.py
diff --git a/rviz_interface/rviz_interface/src/InteractiveObject.cpp b/rviz_interface/src/InteractiveObject.cpp
similarity index 100%
rename from rviz_interface/rviz_interface/src/InteractiveObject.cpp
rename to rviz_interface/src/InteractiveObject.cpp
diff --git a/rviz_interface/rviz_interface/src/InteractiveObject.hpp b/rviz_interface/src/InteractiveObject.hpp
similarity index 100%
rename from rviz_interface/rviz_interface/src/InteractiveObject.hpp
rename to rviz_interface/src/InteractiveObject.hpp
diff --git a/rviz_interface/rviz_interface/src/InterfacePanel.cpp b/rviz_interface/src/InterfacePanel.cpp
similarity index 100%
rename from rviz_interface/rviz_interface/src/InterfacePanel.cpp
rename to rviz_interface/src/InterfacePanel.cpp
diff --git a/rviz_interface/rviz_interface/src/InterfacePanel.hpp b/rviz_interface/src/InterfacePanel.hpp
similarity index 100%
rename from rviz_interface/rviz_interface/src/InterfacePanel.hpp
rename to rviz_interface/src/InterfacePanel.hpp
diff --git a/rviz_interface/rviz_interface/src/RvizInterface.cpp b/rviz_interface/src/RvizInterface.cpp
similarity index 100%
rename from rviz_interface/rviz_interface/src/RvizInterface.cpp
rename to rviz_interface/src/RvizInterface.cpp
diff --git a/rviz_interface/rviz_interface/src/RvizInterface.hpp b/rviz_interface/src/RvizInterface.hpp
similarity index 100%
rename from rviz_interface/rviz_interface/src/RvizInterface.hpp
rename to rviz_interface/src/RvizInterface.hpp