Continued massive package and class reorg