rework on folder architecture