fix moduleclass for [c-h] packages, plus headers

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