More work on file structure