Various changes
Removed the Package class