Refactoring of Packages and Collection Demo Slides