Problem 1 solved. Folder arrays added.
problem 2 solved.