Use correct scope.

Use proper scope for packages.

Make the project consistent with others, also provide individual tests
to module components.