Added xcf.
Reorganized file structure.