Moved Packager into te right place
Various refactorings on Packager class