Restructuring files.
Merge.