Removed unnecessary package types
Dropped usage of type package