UPDATED: File structure