Fix new file organizations