renamed packages to new naming scheme