Minimal changes.

Changed some file names.
Fixed problem in manifest.