fix moduleclass for [i-n] packages, plus headers

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