prepare for refactor to establish cleaner separation between what
is now in packages. package will also allow for cleaner namespaces
in the future