changed package name to reflect new scheme