Move main module headers 1 level up