before new folder structure