pkg: move everything into subpackages

Following up #1424
ugh - I see that the file is called test_util.go while the package name is "test". How about we rename the "test" package to "testutil"