Moved two files that were placed in wrong packages.