Merge pull request #161 from fgeorgatos/525_adjust_moduleclasses_into_categories_for_easyconfigs_ijklmn fix moduleclass for [i-n] packages, plus headers