Change package.
Scope fix + small refactoring.
Usage type grouping fix.
Change package.
Use the right test base (no java dependencies).