In addition to the file moves, the package names of the tests have been updated and adjusted to match their new locations.