Renaming packages to conform to convention