Modules Refactoring

Signed-off-by: Michele Salvini <info@slv.dj>