Further updated file layout