Re-factoring package names.