Merged the 2 Package classes