refactored package structure so test packages map to source packages.