changed namespace, became part of common package