Little architectural changes in packages