Files and folder restructured