NXP-14292 reorg in java packages