Changing module structure to remove inherits

Signed-off-by: Matthieu Nantern <mnantern@xebia.fr>