updated file layout