Changes to the packages so I can work with them better