new folder architecture