Revert "Moved a file."

This reverts commit 035350def0c997b62549d6600b79a7dc69488ebe.
Reorganized