Format changes so there is actually sensical file structure