Re-structuring files structure