Restructure building of FolderItems to include project folders.