New files organization

New files organization