Adding merge sort and cleaning up files to single spec.