renaming packages and folders. make names simpler