reorganize structure of folders