Java IDE's get upset if the package does not match the path, so move some
files to make them match.

Change-Id: Ia6a1f3dc572cc1d30492491de9cf1462f2887e6f