rework of the folder's architecture