UPDATED FILE STRUCTURE.