Fix - load Folders model the new way