Revert "remove unused items"

This reverts commit d7b3f6ed6bb7278e5f11d48aa2af6261bbea9dad.
correct packaging type
Add stub classes