GF2N package refactoring