Remove files in old format (<3.1)
Add files in new format (=>3.1)