refactoring to streamline top level package names