Fixed forgotten deleted files in code reorganization.