move tests and test resources to new package names