Updated file layout