Restructure the module

Restructuration of the module in order to be usable with the new
igestis 2.5