Some improvements.
Some files are renamed.