Merges old data format into data directory