Use new package names in config and classes