Move test packages to their right location