Re-organised files into folders, for iOS 7 update