restructured entire folder structure