> Okay, then let's keep the content layout as you propose it and have 
> just the files renamed.

done