Renaming packages to better organize code.