pkg: move everything into subpackages

Following up #1424
Why introduce "util" here? It would be clearer to call it "pkgtest"