diff --git a/lutin_speex-dsp.py b/lutin_speex-dsp.py
index 619d882..f8f835c 100644
--- a/lutin_speex-dsp.py
+++ b/lutin_speex-dsp.py
@@ -1,13 +1,28 @@
 #!/usr/bin/python
 import lutin.module as module
 import lutin.tools as tools
+import os
+
+def get_type():
+	return "LIBRARY"
 
 def get_desc():
 	return "Algorithm of speex codec"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speex-dsp', 'LIBRARY')
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def get_version():
+	return [1,2,"rc3"]
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	# add the file to compile:
 	my_module.add_src_file([
 		'speex-dsp/libspeexdsp/filterbank.c',
@@ -22,25 +37,20 @@ def create(target):
 		'speex-dsp/libspeexdsp/kiss_fft.c',
 		'speex-dsp/libspeexdsp/kiss_fftr.c'
 		])
-	"""
 	my_module.add_header_file([
-		'speex-dsp/include/speex/filterbank.h',
-		'speex-dsp/include/speex/resample.h',
-		'speex-dsp/include/speex/scal.h',
-		'speex-dsp/include/speex/fftwrap.h',
-		'speex-dsp/include/speex/jitter.h',
-		'speex-dsp/include/speex/mdf.h',
-		'speex-dsp/include/speex/preprocess.h',
-		'speex-dsp/include/speex/smallft.h',
-		'speex-dsp/include/speex/buffer.h',
-		'speex-dsp/include/speex/kiss_fft.h',
-		'speex-dsp/include/speex/kiss_fftr.h'
-		])
-	"""
+		'speex-dsp/include/speex/speexdsp_types.h',
+		'speex-dsp/include/speex/speexdsp_config_types.h',
+		'speex-dsp/include/speex/speex_buffer.h',
+		'speex-dsp/include/speex/speex_preprocess.h',
+		'speex-dsp/include/speex/speex_echo.h',
+		'speex-dsp/include/speex/speex_jitter.h',
+		'speex-dsp/include/speex/speex_resampler.h'
+		],
+		destination_path="speex")
 	# name of the dependency
 	my_module.add_module_depend('z')
-	my_module.compile_version_CC(1999)
-	my_module.add_export_path(tools.get_current_path(__file__) + "/speex-dsp/include")
+	my_module.compile_version("c", 1999)
+	my_module.add_path(os.path.join(tools.get_current_path(__file__), "speex-dsp/include"))
 	# configure library:
 	# Make use of ARM4 assembly optimizations
 	#my_module.compile_flags('c', "-DARM4_ASM=1")
diff --git a/lutin_speex-test-denoise.py b/lutin_speex-test-denoise.py
index 1942cac..3110d07 100644
--- a/lutin_speex-test-denoise.py
+++ b/lutin_speex-test-denoise.py
@@ -2,19 +2,31 @@
 import lutin.module as module
 import lutin.tools as tools
 
+
+def get_type():
+	return "BINARY"
+
+def get_sub_type():
+	return "TEST"
+
 def get_desc():
-	return "test: denoise test algorithm"
+	return "Algorithm of speex codec"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speex-test-denoise', 'BINARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_extra_compile_flags()
-	# add the file to compile:
 	my_module.add_src_file([
 		'speex-dsp/libspeexdsp/testdenoise.c'
 		])
-	# name of the dependency
 	my_module.add_module_depend('speex-dsp')
 	return my_module
 
diff --git a/lutin_speex-test-echo.py b/lutin_speex-test-echo.py
index fb97849..d445b23 100644
--- a/lutin_speex-test-echo.py
+++ b/lutin_speex-test-echo.py
@@ -2,19 +2,31 @@
 import lutin.module as module
 import lutin.tools as tools
 
+
+def get_type():
+	return "BINARY"
+
+def get_sub_type():
+	return "TEST"
+
 def get_desc():
-	return "test: echo test algorithm"
+	return "echo test algorithm"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speex-test-echo', 'BINARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_extra_compile_flags()
-	# add the file to compile:
 	my_module.add_src_file([
 		'speex-dsp/libspeexdsp/testecho.c'
 		])
-	# name of the dependency
 	my_module.add_module_depend('speex-dsp')
 	return my_module
 
diff --git a/lutin_speex-test-jitter.py b/lutin_speex-test-jitter.py
index b578c0c..dc65647 100644
--- a/lutin_speex-test-jitter.py
+++ b/lutin_speex-test-jitter.py
@@ -2,19 +2,31 @@
 import lutin.module as module
 import lutin.tools as tools
 
+
+def get_type():
+	return "BINARY"
+
+def get_sub_type():
+	return "TEST"
+
 def get_desc():
-	return "test: jitter test algorithm"
+	return "jitter test algorithm"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speex-test-jitter', 'BINARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_extra_compile_flags()
-	# add the file to compile:
 	my_module.add_src_file([
 		'speex-dsp/libspeexdsp/testjitter.c'
 		])
-	# name of the dependency
 	my_module.add_module_depend('speex-dsp')
 	return my_module
 
diff --git a/lutin_speex-test-resample.py b/lutin_speex-test-resample.py
index 40042bc..c8b51f1 100644
--- a/lutin_speex-test-resample.py
+++ b/lutin_speex-test-resample.py
@@ -2,19 +2,31 @@
 import lutin.module as module
 import lutin.tools as tools
 
+
+def get_type():
+	return "BINARY"
+
+def get_sub_type():
+	return "TEST"
+
 def get_desc():
-	return "test: resample test algorithm"
+	return "resample test algorithm"
 
+def get_licence():
+	return "BSD-3"
 
-def create(target):
-	my_module = module.Module(__file__, 'speex-test-resample', 'BINARY')
-	# add extra compilation flags :
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Xiph"
+
+def create(target, module_name):
+	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_extra_compile_flags()
-	# add the file to compile:
 	my_module.add_src_file([
 		'speex-dsp/libspeexdsp/testresample.c'
 		])
-	# name of the dependency
 	my_module.add_module_depend('speex-dsp')
 	return my_module