Organizing files for merge.
Removed test sort.