Package reorg and commenting.