rework the folder structure again