Code cleanup: renamed packages to match the actual intent