Revert "Add class package to package"

This reverts commit 3e4b00b9543981ec3fd185aa455c46c40b27eed5.
Undo trim