fix new folder structure