Update README in Software.
Remove redundant folder created from auto-merging.