restructuring files hierarchy