More Folder Architecture Changes