Rename folders yet again, set up importer-> ios app core data linking