Changed file structure.

Changed default file structure.