General file reorganization/cleanup.