* Move internal packages into internal folder * Fix testutil imports
Co-authored-by: Henrique Santos <henrique.santos@freiheit.com>