Move the 3 pkgs into their own *-pkg dir

This makes releasing each pkg independently easier.
Modify testpath for the new structure.