adjust moduleclasses as per remarks in #162

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>