Renaming the packages for clarity