Change folder structure, add modal

add modal